Skip to content

gtk4: update to 4.22.2. #59688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oreo639 wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −73
Open

gtk4: update to 4.22.2. #59688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions srcpkgs/gtk4/patches/docs.patch
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions srcpkgs/gtk4/patches/fix-vulkan32bit.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From d2fa538eba97b66d2bd5ac7d27b98925e4420e2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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

15 changes: 11 additions & 4 deletions srcpkgs/gtk4/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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')
Expand All @@ -31,9 +31,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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"
Expand Down Expand Up @@ -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
}
}

Expand Down