From a370259bf15cfd24155180c766f2951a0ff22c4f1a49ba78d78d656f6672a52b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Aug 2024 08:30:24 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1229162 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk4?expand=0&rev=79 --- 0002-Revert-no-pointer-viewport.patch | 37 +++++++++++++++++++++++++++ _service | 2 +- gtk-4.15.4.obscpio | 3 +++ gtk-4.15.5.obscpio | 3 --- gtk.obsinfo | 6 ++--- gtk4.changes | 27 +------------------ gtk4.spec | 6 ++++- 7 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 0002-Revert-no-pointer-viewport.patch create mode 100644 gtk-4.15.4.obscpio delete mode 100644 gtk-4.15.5.obscpio 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/_service b/_service index a5b0ec4..bb0064c 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/gtk.git - 4.15.5 + 4.15.4 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/gtk-4.15.4.obscpio b/gtk-4.15.4.obscpio new file mode 100644 index 0000000..b6d2b01 --- /dev/null +++ b/gtk-4.15.4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:557828536d3625f71194b22666b6485019c0c10cd3256938a7a987253fdf8ab9 +size 89276942 diff --git a/gtk-4.15.5.obscpio b/gtk-4.15.5.obscpio deleted file mode 100644 index da44f1f..0000000 --- a/gtk-4.15.5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e62fc2b4fd1e45e2905c7041f2184ddbcc9e95d2c7793776988b7db0cc1d4772 -size 89392654 diff --git a/gtk.obsinfo b/gtk.obsinfo index 80643f6..77fbd0a 100644 --- a/gtk.obsinfo +++ b/gtk.obsinfo @@ -1,4 +1,4 @@ name: gtk -version: 4.15.5 -mtime: 1723405434 -commit: 07658347a91866f009379e6d8bcc7d1b7a653f8d +version: 4.15.4 +mtime: 1722358222 +commit: 322bbd2376f5279cf9b08925c2c836fa777e283b diff --git a/gtk4.changes b/gtk4.changes index b2164b2..18febc4 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,32 +1,7 @@ -------------------------------------------------------------------- -Mon Aug 12 07:06:16 UTC 2024 - Bjørn Lie - -- Update to version 4.15.5: - + GtkTextView: ADd GtkTextBufferCommitNotify - + CSS: Propagate color state information to GSK for many - features: colors, borders, shadows, text - + Gdk: - - Fix an fd leak in the Vulkan code - - Fix a leak of EGLSurfaces and DMA buffers - - Set the opaque region of surfaces automatically based on - their content - + Gsk: - - Fix Emoji rendering in Vulkan - - Rework color handling to take color states into account - - Implement more powerful occlusion culling - - Minimize our use of renderpasses - + Debugging: The inspector shows details about color states - + Deprecations: - - gdk_draw_context_begin/end_frame - - gdk_surface_set_opaque_region - + Build: Require gstreamer 1.24 - + Updated translations. -- Drop 0002-Revert-no-pointer-viewport.patch: Fixed upstream. - ------------------------------------------------------------------- Fri Aug 2 20:17:08 UTC 2024 - Joshua Smith -- Add 0002-Revert-no-pointer-viewport.patch: +- Add 0002-Revert-no-pointer-viewport.patch -- Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 ------------------------------------------------------------------- diff --git a/gtk4.spec b/gtk4.spec index d3877cf..c0bd279 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -28,7 +28,7 @@ %endif Name: gtk4 -Version: 4.15.5 +Version: 4.15.4 Release: 0 Summary: The GTK+ toolkit library (version 4) License: LGPL-2.1-or-later @@ -46,6 +46,10 @@ 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 +# https://gitlab.gnome.org/GNOME/gtk/-/issues/6620 +# 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 # We do not support building against cups 2.3 betas BuildConflicts: (cups-devel > 2.3 with cups-devel < 2.3.0)