Skip to content

Commit 9fcc335

Browse files
committed
gtk4: update to 4.22.2.
1 parent 6ed0e85 commit 9fcc335

3 files changed

Lines changed: 40 additions & 73 deletions

File tree

srcpkgs/gtk4/patches/docs.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From d2fa538eba97b66d2bd5ac7d27b98925e4420e2f Mon Sep 17 00:00:00 2001
2+
From: oreo639 <oreo6391@gmail.com>
3+
Date: Tue, 31 Mar 2026 21:55:56 -0700
4+
Subject: [PATCH] gskvulkanimage: fix building on 32-bit
5+
6+
VkImage is always a 64-bit integer, however the size of NULL
7+
changes depending on the architecture.
8+
9+
Instead, use VK_NULL_HANDLE which is always 64-bits.
10+
---
11+
gsk/gpu/gskvulkanimage.c | 2 +-
12+
1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+
diff --git a/gsk/gpu/gskvulkanimage.c b/gsk/gpu/gskvulkanimage.c
15+
index c85370ee2df..f713908d252 100644
16+
--- a/gsk/gpu/gskvulkanimage.c
17+
+++ b/gsk/gpu/gskvulkanimage.c
18+
@@ -1275,7 +1275,7 @@ gsk_vulkan_image_new_for_dmabuf (GskVulkanDevice *device,
19+
{
20+
GDK_DEBUG (DMABUF, "Vulkan failed to dup() fd: %s", g_strerror (errno));
21+
vkDestroyImage (vk_device, self->vk_image, NULL);
22+
- self->vk_image = NULL;
23+
+ self->vk_image = VK_NULL_HANDLE;
24+
g_object_unref (self);
25+
return NULL;
26+
}
27+
--
28+
GitLab
29+

srcpkgs/gtk4/template

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'gtk4'
22
pkgname=gtk4
3-
version=4.20.2
3+
version=4.22.2
44
revision=1
55
build_style=meson
66
build_helper="gir"
@@ -18,7 +18,7 @@ hostmakedepends="gettext-devel glib-devel gi-docgen perl
1818
pkg-config sassc gettext libxslt docbook-xsl python3-docutils
1919
$(vopt_if wayland 'wayland-devel wayland-protocols') shaderc"
2020
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
21-
iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel librsvg-devel
21+
iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel
2222
$(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
2323
$(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
2424
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
@@ -31,9 +31,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
3131
license="LGPL-2.1-or-later"
3232
homepage="https://www.gtk.org/"
3333
#changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
34-
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-20/NEWS"
34+
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-22/NEWS"
3535
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
36-
checksum=5e8240edecafaff2b8baf4663bdceaa668ef10a207bee4d7f90e010e10bddc5c
36+
checksum=b1c987370a0c30780cde351bdbee02eef816728f1c1c2ec7c8093281c0709ee8
37+
make_check=no # Test suite is flaky (disabled), and undocumented function errors are left in releases
3738

3839
# Package build options
3940
build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"
@@ -113,6 +114,12 @@ gtk4-demo_package() {
113114
vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
114115
vmove usr/share/man/man1/gtk4-node-editor.1
115116
vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml
117+
118+
vmove usr/bin/gtk4-icon-editor
119+
vmove usr/share/applications/org.gtk.Shaper.desktop
120+
vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Shaper.Devel.svg
121+
vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Shaper.svg
122+
vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.Shaper-symbolic.svg
116123
}
117124
}
118125

0 commit comments

Comments
 (0)