From ea6d31bd5e48ed9c529ae27cf5e4e1ca4f4ef0b3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 28 Feb 2024 21:38:20 -0500 Subject: [PATCH 1/2] gtk+3: update to 3.24.41, provide gtk-update-icon-cache --- srcpkgs/gtk+3/patches/tiling-fix.patch | 87 ++++++++++++++++++++++++++ srcpkgs/gtk+3/template | 21 ++++--- srcpkgs/gtk-update-icon-cache | 2 +- 3 files changed, 100 insertions(+), 10 deletions(-) create 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 new file mode 100644 index 00000000000000..9e0e815a37fd7a --- /dev/null +++ b/srcpkgs/gtk+3/patches/tiling-fix.patch @@ -0,0 +1,87 @@ +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 bc2ab1ad90fd79..6775efc6d2136b 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,6 +1,6 @@ # Template file for 'gtk+3' pkgname=gtk+3 -version=3.24.38 +version=3.24.41 revision=1 build_style=meson build_helper="gir" @@ -17,8 +17,8 @@ configure_args=" -Dexamples=false " conf_files="/etc/gtk-3.0/im-multipress.conf" -hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl - pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')" +hostmakedepends="gettext-devel glib-devel gtk-doc perl pkg-config + gdk-pixbuf $(vopt_if wayland 'wayland-devel wayland-protocols')" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel iso-codes $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') @@ -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=ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 +checksum=47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa make_check_pre="xvfb-run dbus-run-session" # _broken_tests="" @@ -66,11 +66,6 @@ pre_check() { done } -post_install() { - rm ${DESTDIR}/usr/bin/gtk-update-icon-cache - rm ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1 -} - gtk+3-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -102,3 +97,11 @@ gtk+3-demo_package() { vmove usr/share/icons } } + +gtk-update-icon-cache_package() { + short_desc+=" - icon-cache update tool" + pkg_install() { + vmove usr/bin/gtk-update-icon-cache + vmove usr/share/man/man1/gtk-update-icon-cache.1 + } +} diff --git a/srcpkgs/gtk-update-icon-cache b/srcpkgs/gtk-update-icon-cache index 50dbbf5fe756db..6dc54ba3851aae 120000 --- a/srcpkgs/gtk-update-icon-cache +++ b/srcpkgs/gtk-update-icon-cache @@ -1 +1 @@ -gtk+ \ No newline at end of file +gtk+3 \ No newline at end of file From 28443fc320c926c03072b9e48d757556be38bf61 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 29 Feb 2024 06:59:43 -0500 Subject: [PATCH 2/2] gtk+: no longer provide gtk-update-icon-cache --- srcpkgs/gtk+/template | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 06bbda0de1513d..053cabde966c9e 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,11 +1,12 @@ # Template file for 'gtk+' pkgname=gtk+ version=2.24.33 -revision=2 +revision=3 build_style=gnu-configure build_helper="gir" configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)" -hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config perl xmlto glib-devel gtk-update-icon-cache + $(vopt_if gir gobject-introspection)" makedepends="libglib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel libXdamage-devel fontconfig-devel gdk-pixbuf-devel @@ -19,6 +20,8 @@ homepage="https://gtk.org" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-2-24/NEWS" distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" checksum=ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da +# X11 tests fail, not worth bothering on this dying package +make_check=no # gtk-builder-convert python_version=3 @@ -28,7 +31,7 @@ build_options="gir cups" build_options_default="gir cups" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache" + hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel" fi pre_configure() { @@ -43,6 +46,10 @@ pre_configure() { post_install() { # Provide a default (icon)theme and font. vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0 + + # This is now provided by gtk+3 + rm ${DESTDIR}/usr/bin/gtk-update-icon-cache + rm ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1 } gtk+-devel_package() { @@ -60,6 +67,7 @@ gtk+-devel_package() { vmove usr/share/aclocal } } + gtk+-demo_package() { short_desc+=" - demonstration application" pkg_install() { @@ -67,10 +75,3 @@ gtk+-demo_package() { vmove usr/share/gtk-2.0/demo } } -gtk-update-icon-cache_package() { - short_desc+=" - The GTK+ update icon cache tool" - pkg_install() { - vmove usr/bin/gtk-update-icon-cache - vmove usr/share/man/man1/gtk-update-icon-cache.1 - } -}