d/patches: Mark patch for #1029972 as also applied in 4.8.4

This brings us up to date with the upstream gtk-4-8 branch as of
4.8.3-17-g790b9d59ad.

diff --git a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch b/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch
index 948652bf933eeb0f79d400a97bc93e77e6fddf39..60ea7576ddfc4319b526a675baa33d072a69f600 100644 (file)
--- a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch
+++ b/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch
@@ -6,12 +6,15 @@ We no longer need to make much distinction between multiple logical
 devices, plus it breaks esp. with the Xwayland input device distribution.
 Just iterate across all devices and reset their scroll valuators.
 
+(cherry picked from commit 824e983372d939693f7eba5c394e647a9035a0f8)
+
 Origin: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5479
 Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4160
 Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5202
 Bug-Debian: https://bugs.debian.org/1029972
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk4/+bug/1993594
 Applied-upstream: 4.9.3, commit:824e983372d939693f7eba5c394e647a9035a0f8
+Applied-upstream: 4.8.4, commit:37843ec941f611a6c9e05732442c86e99016d5f0
 ---
  gdk/x11/gdkdevicemanager-xi2.c | 15 +++------------
  1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index f029df3c7ebd4210a78cbe9dfc07c267e1d9aa85..790e36d151a072ecaec1d8d09d32418fe3b91b55 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,10 +6,10 @@ gdk-surface-Handle-clicks-outside-client-surfaces.patch
 fontchooser-Drop-a-few-errant-translations.patch
 gtkcssanimatedstyle-Fix-return-of-new_advance.patch
 Update-Turkish-translation-2.patch
+gdk-x11-Reset-all-scroll-valuators-on-enter.patch
 testsuite-Use-separate-setups-for-unstable-tests-instead-.patch
 testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch
 node-editor-Save-test-data-relative-to-current-working-di.patch
-gdk-x11-Reset-all-scroll-valuators-on-enter.patch
 debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 debian/reftests-Allow-minor-differences-to-be-tolerated.patch
 debian/Disable-inscription-markup.ui-reftest.patch