guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 58987c9031b8b312337f1c430fc98f5a54594319
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Aug 26 22:59:56 2026 +0900
gnu: gtk: Fix build on i686-linux.
* gnu/packages/gtk.scm (gtk) [source] <patches>: Add
"gtk-fix-32-bit-vkimage-null.patch".
* gnu/packages/patches/gtk4-fix-32-bit-vkimage-null.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/gtk.scm | 1 +
.../patches/gtk4-fix-32-bit-vkimage-null.patch | 31 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7ed880a1b60..896d5c544b3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1617,6 +1617,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk3-treeview-test-fix.patch \
%D%/packages/patches/gtk4-demo-reproducible.patch \
+ %D%/packages/patches/gtk4-fix-32-bit-vkimage-null.patch \
%D%/packages/patches/gtk4-needs-udmabuf.patch \
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8b6856f3dc7..df9a821ea73 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1123,6 +1123,7 @@ application suites.")
(base32 "14q86c8gks2m4h4pwgkbas1f5r5j3z168wvcamd6cfnjqxh9zgai"))
(patches
(search-patches "gtk4-demo-reproducible.patch"
+ "gtk4-fix-32-bit-vkimage-null.patch"
"gtk4-needs-udmabuf.patch"
"gtk4-respect-GUIX_GTK4_PATH.patch"))
(modules '((guix build utils)))))
diff --git a/gnu/packages/patches/gtk4-fix-32-bit-vkimage-null.patch
b/gnu/packages/patches/gtk4-fix-32-bit-vkimage-null.patch
new file mode 100644
index 00000000000..aa64ec93734
--- /dev/null
+++ b/gnu/packages/patches/gtk4-fix-32-bit-vkimage-null.patch
@@ -0,0 +1,31 @@
+From 10d43de8f4f942cb591ada3103474bd7213425f1 Mon Sep 17 00:00:00 2001
+From: oreo639 <[email protected]>
+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.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9745>
+---
+ 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
+
