From 813a2893923dd2a073ab926e7f8aafbae3b949bd Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 23 May 2024 10:15:16 +0300 Subject: [PATCH] gtk+3: update to 3.24.42. --- srcpkgs/gtk+3/patches/tiling-fix.patch | 87 -------------------------- srcpkgs/gtk+3/template | 6 +- 2 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 srcpkgs/gtk+3/patches/tiling-fix.patch diff --git a/srcpkgs/gtk+3/patches/tiling-fix.patch b/srcpkgs/gtk+3/patches/tiling-fix.patch deleted file mode 100644 index 9e0e815a37fd7a..00000000000000 --- a/srcpkgs/gtk+3/patches/tiling-fix.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 9020a6f71e41f02e416f940ca84e4a15d703693d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= -Date: Fri, 12 Jan 2024 19:43:20 +0100 -Subject: [PATCH] [gtk3/wayland] Infer resizable edges for tiled windows if - possible. - -This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1871627 - -All GTK3/4 apps on non-GNOME desktops aren't resizable if they are -tiled. - -This patch makes the non-tiled edges resizable if we have per-edge -tiling, but not per-edge resizing information. - -We might want to make all edges resizable, but that might not be fine -for tiling compositors. ---- - gdk/wayland/gdkwindow-wayland.c | 46 +++++++++++++++++++++++++++++++++ - 1 file changed, 46 insertions(+) - -diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c -index 2bbff80bee5..f09f651ac7a 100644 ---- a/gdk/wayland/gdkwindow-wayland.c -+++ b/gdk/wayland/gdkwindow-wayland.c -@@ -1664,6 +1664,49 @@ should_use_fixed_size (GdkWindowState state) - GDK_WINDOW_STATE_TILED); - } - -+static gboolean -+has_per_edge_tiling_info (GdkWindowState state) -+{ -+ return state & (GDK_WINDOW_STATE_TOP_TILED | -+ GDK_WINDOW_STATE_RIGHT_TILED | -+ GDK_WINDOW_STATE_BOTTOM_TILED | -+ GDK_WINDOW_STATE_LEFT_TILED); -+} -+ -+static GdkWindowState -+infer_edge_constraints (GdkWindowState state) -+{ -+ if (state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) -+ return state; -+ -+ if (!(state & GDK_WINDOW_STATE_TILED) || !has_per_edge_tiling_info (state)) -+ return state | -+ GDK_WINDOW_STATE_TOP_RESIZABLE | -+ GDK_WINDOW_STATE_RIGHT_RESIZABLE | -+ GDK_WINDOW_STATE_BOTTOM_RESIZABLE | -+ GDK_WINDOW_STATE_LEFT_RESIZABLE; -+ -+ if (!(state & GDK_WINDOW_STATE_TOP_TILED)) -+ state |= GDK_WINDOW_STATE_TOP_RESIZABLE; -+ if (!(state & GDK_WINDOW_STATE_RIGHT_TILED)) -+ state |= GDK_WINDOW_STATE_RIGHT_RESIZABLE; -+ if (!(state & GDK_WINDOW_STATE_BOTTOM_TILED)) -+ state |= GDK_WINDOW_STATE_BOTTOM_RESIZABLE; -+ if (!(state & GDK_WINDOW_STATE_LEFT_TILED)) -+ state |= GDK_WINDOW_STATE_LEFT_RESIZABLE; -+ -+ return state; -+} -+ -+static gboolean -+supports_native_edge_constraints (GdkWindowImplWayland *impl) -+{ -+ struct gtk_surface1 *gtk_surface = impl->display_server.gtk_surface; -+ if (!gtk_surface) -+ return FALSE; -+ return gtk_surface1_get_version (gtk_surface) >= GTK_SURFACE1_CONFIGURE_EDGES_SINCE_VERSION; -+} -+ - static void - gdk_wayland_window_handle_configure (GdkWindow *window, - uint32_t serial) -@@ -1712,6 +1755,9 @@ gdk_wayland_window_handle_configure (GdkWindow *window, - new_state = impl->pending.state; - impl->pending.state = 0; - -+ if (!supports_native_edge_constraints (impl)) -+ new_state = infer_edge_constraints (new_state); -+ - fixed_size = should_use_fixed_size (new_state); - - saved_size = (width == 0 && height == 0); --- -GitLab - diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 550a69c8cbfaf9..075e76ed0655e3 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,7 +1,7 @@ # Template file for 'gtk+3' pkgname=gtk+3 -version=3.24.41 -revision=2 +version=3.24.42 +revision=1 build_style=meson build_helper="gir" configure_args=" @@ -32,7 +32,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa +checksum=50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 make_check_pre="xvfb-run dbus-run-session" # _broken_tests=""