From 9fcc3354c466748bd1b9749a5c5352edfe4efb70 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 20:19:40 -0700 Subject: [PATCH] gtk4: update to 4.22.2. --- srcpkgs/gtk4/patches/docs.patch | 69 ---------------------- srcpkgs/gtk4/patches/fix-vulkan32bit.patch | 29 +++++++++ srcpkgs/gtk4/template | 15 +++-- 3 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 srcpkgs/gtk4/patches/docs.patch create mode 100644 srcpkgs/gtk4/patches/fix-vulkan32bit.patch diff --git a/srcpkgs/gtk4/patches/docs.patch b/srcpkgs/gtk4/patches/docs.patch deleted file mode 100644 index c98a0924bcafcc..00000000000000 --- a/srcpkgs/gtk4/patches/docs.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c -index 58d9020c33..85e4d13216 100644 ---- a/gdk/gdkevents.c -+++ b/gdk/gdkevents.c -@@ -2614,6 +2614,16 @@ gdk_scroll_event_get_unit (GdkEvent *event) - return self->unit; - } - -+/** -+ * gdk_scroll_event_get_relative_direction: -+ * @event: (type GdkScrollRelativeDirection): a relative scroll direction. -+ * -+ * Extracts the scroll direction relative to the physical motion. -+ * -+ * Returns: the relative scroll direction. -+ * -+ * Since: 4.20 -+ */ - GdkScrollRelativeDirection - gdk_scroll_event_get_relative_direction (GdkEvent *event) - { -diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c -index 75a6b43767..0f4a8aac30 100644 ---- a/gdk/gdktoplevel.c -+++ b/gdk/gdktoplevel.c -@@ -872,6 +872,8 @@ gdk_toplevel_unexport_handle (GdkToplevel *toplevel, - * - * The capabilities that are available for this toplevel. - * -+ * Returns: the capabilities of the `GdkToplevel`. -+ * - * Since: 4.20 - */ - GdkToplevelCapabilities -diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h -index 97568d411a..5b2c70ff27 100644 ---- a/gsk/gskrendernode.h -+++ b/gsk/gskrendernode.h -@@ -203,11 +203,6 @@ typedef struct _GskBlurNode GskBlurNode; - typedef struct _GskMaskNode GskMaskNode; - typedef struct _GskGLShaderNode GskGLShaderNode GDK_DEPRECATED_TYPE_IN_4_16_FOR(GtkGLArea); - typedef struct _GskSubsurfaceNode GskSubsurfaceNode; --/** -- * GskComponentTransferNode: -- * -- * Since: 4.20 -- */ - typedef struct _GskComponentTransferNode GskComponentTransferNode; - - GDK_AVAILABLE_IN_ALL -diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c -index 2b80fbb8ab..d270240801 100644 ---- a/gsk/gskrendernodeimpl.c -+++ b/gsk/gskrendernodeimpl.c -@@ -8605,6 +8605,14 @@ gsk_subsurface_node_get_subsurface (const GskRenderNode *node) - /* }}} */ - /* {{{ GSK_COMPONENT_TRANSFER_NODE */ - -+/** -+ * GskComponentTransferNode: -+ * -+ * A render node for applying a `GskComponentTransfer` for each color -+ * component of the child node. -+ * -+ * Since: 4.20 -+ */ - struct _GskComponentTransferNode - { - GskRenderNode render_node; diff --git a/srcpkgs/gtk4/patches/fix-vulkan32bit.patch b/srcpkgs/gtk4/patches/fix-vulkan32bit.patch new file mode 100644 index 00000000000000..5f77ed13aa45ab --- /dev/null +++ b/srcpkgs/gtk4/patches/fix-vulkan32bit.patch @@ -0,0 +1,29 @@ +From d2fa538eba97b66d2bd5ac7d27b98925e4420e2f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Tue, 31 Mar 2026 21:55:56 -0700 +Subject: [PATCH] gskvulkanimage: fix building on 32-bit + +VkImage is always a 64-bit integer, however the size of NULL +changes depending on the architecture. + +Instead, use VK_NULL_HANDLE which is always 64-bits. +--- + gsk/gpu/gskvulkanimage.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gsk/gpu/gskvulkanimage.c b/gsk/gpu/gskvulkanimage.c +index c85370ee2df..f713908d252 100644 +--- a/gsk/gpu/gskvulkanimage.c ++++ b/gsk/gpu/gskvulkanimage.c +@@ -1275,7 +1275,7 @@ gsk_vulkan_image_new_for_dmabuf (GskVulkanDevice *device, + { + GDK_DEBUG (DMABUF, "Vulkan failed to dup() fd: %s", g_strerror (errno)); + vkDestroyImage (vk_device, self->vk_image, NULL); +- self->vk_image = NULL; ++ self->vk_image = VK_NULL_HANDLE; + g_object_unref (self); + return NULL; + } +-- +GitLab + diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index e6f7efb52267cd..e1abaec27e3c58 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.20.2 +version=4.22.2 revision=1 build_style=meson build_helper="gir" @@ -18,7 +18,7 @@ hostmakedepends="gettext-devel glib-devel gi-docgen perl pkg-config sassc gettext libxslt docbook-xsl python3-docutils $(vopt_if wayland 'wayland-devel wayland-protocols') shaderc" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel - iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel librsvg-devel + iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel') @@ -31,9 +31,10 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-20/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-22/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=5e8240edecafaff2b8baf4663bdceaa668ef10a207bee4d7f90e010e10bddc5c +checksum=b1c987370a0c30780cde351bdbee02eef816728f1c1c2ec7c8093281c0709ee8 +make_check=no # Test suite is flaky (disabled), and undocumented function errors are left in releases # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" @@ -113,6 +114,12 @@ gtk4-demo_package() { vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg vmove usr/share/man/man1/gtk4-node-editor.1 vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml + + vmove usr/bin/gtk4-icon-editor + vmove usr/share/applications/org.gtk.Shaper.desktop + vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Shaper.Devel.svg + vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Shaper.svg + vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.Shaper-symbolic.svg } }