From 67c496521ef71899f1cedfe9d5150201b84c12c1a3f7e7f860370015b657cfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 3 Aug 2024 12:42:22 +0000 Subject: [PATCH 1/2] Accepting request 1191258 from home:smolsheep:upgrades This issue popped up and was causing scaling to behave funny for other users. - Add 0002-Revert-no-pointer-viewport.patch -- Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 OBS-URL: https://build.opensuse.org/request/show/1191258 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=171 --- 0002-Revert-no-pointer-viewport.patch | 37 +++++++++++++++++++++++++++ gtk4.changes | 6 +++++ gtk4.spec | 5 ++++ 3 files changed, 48 insertions(+) create mode 100644 0002-Revert-no-pointer-viewport.patch diff --git a/0002-Revert-no-pointer-viewport.patch b/0002-Revert-no-pointer-viewport.patch new file mode 100644 index 0000000..3bbefa6 --- /dev/null +++ b/0002-Revert-no-pointer-viewport.patch @@ -0,0 +1,37 @@ +From 3d802177be2f2e5fb95fdb988108dd1b048c5579 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 31 Jul 2024 07:29:37 -0400 +Subject: [PATCH] wayland: No viewporter for cursors + +The outlook for mutter supporting this in GNOME 47 are cloudy, +so lets flip the switch back. You can still set +USE_POINTER_VIEWPORT in the environment to try this code. +--- + gdk/wayland/gdkdevice-wayland.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c +index 1070d7f9e1d..139c22cd39b 100644 +--- a/gdk/wayland/gdkdevice-wayland.c ++++ b/gdk/wayland/gdkdevice-wayland.c +@@ -265,13 +265,13 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device) + guint next_image_index, next_image_delay; + gboolean retval = G_SOURCE_REMOVE; + GdkWaylandTabletData *tablet; +- gboolean use_viewport; ++ gboolean use_viewport = FALSE; + + tablet = gdk_wayland_seat_find_tablet (seat, device); + +- use_viewport = pointer->pointer_surface_viewport != NULL; +- if (g_getenv ("NO_POINTER_VIEWPORT")) +- use_viewport = FALSE; ++ if (pointer->pointer_surface_viewport && ++ g_getenv ("USE_POINTER_VIEWPORT")) ++ use_viewport = TRUE; + + if (pointer->cursor) + { +-- +GitLab + diff --git a/gtk4.changes b/gtk4.changes index 96e077d..18febc4 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 2 20:17:08 UTC 2024 - Joshua Smith + +- Add 0002-Revert-no-pointer-viewport.patch -- + Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 + ------------------------------------------------------------------- Thu Aug 1 04:33:31 UTC 2024 - Dominique Leuenberger diff --git a/gtk4.spec b/gtk4.spec index 40234e4..ef137a2 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -46,6 +46,11 @@ Source99: gtk4-rpmlintrc # PATCH-FIX-OPENSUSE 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -- Revert "Meson: Simplify pkgconfig file generator" Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch +# Fix the gigantic cursor issue pulled in latest version +# https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 +# PATCH-FIX-OPENSUSE 0002-Revert-no-pointer-viewport.patch -- +Patch1: 0002-Revert-no-pointer-viewport.patch + BuildRequires: cups-devel >= 2.0 # We do not support building against cups 2.3 betas BuildConflicts: (cups-devel > 2.3 with cups-devel < 2.3.0) From 86a1466df46b7860192695b92603b1e45c8fb9092ab931163ddbd171e2528323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 3 Aug 2024 12:44:47 +0000 Subject: [PATCH 2/2] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=172 --- gtk4.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk4.spec b/gtk4.spec index ef137a2..c0bd279 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -46,9 +46,8 @@ Source99: gtk4-rpmlintrc # PATCH-FIX-OPENSUSE 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -- Revert "Meson: Simplify pkgconfig file generator" Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -# Fix the gigantic cursor issue pulled in latest version # https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 -# PATCH-FIX-OPENSUSE 0002-Revert-no-pointer-viewport.patch -- +# PATCH-FIX-UPSTREAM 0002-Revert-no-pointer-viewport.patch -- Fix the gigantic cursor issue pulled in latest version Patch1: 0002-Revert-no-pointer-viewport.patch BuildRequires: cups-devel >= 2.0