karrikuh [1] filed a merge request for gtk4 [2]: From 41de8ea3fc4d802e2ef36f7600186a446d611cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20W=C3=BCrtz?= <dom@blaukraut.info> Date: Sat, 19 Dec 2020 12:38:04 +0100 Subject: [PATCH] upgpkg: gtk4 4.0.0 --- PKGBUILD | 13 ++++++++++--- gtk4-vulkan-fix.patch | 13 +++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 gtk4-vulkan-fix.patch diff --git a/PKGBUILD b/PKGBUILD index 96719fb..8be7950 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Based on gtk4-git pkgname=gtk4 -pkgver=3.99.4 -pkgrel=2 +pkgver=4.0.0 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=('i686' 'x86_64') url="https://www.gtk.org/" @@ -49,14 +49,21 @@ source=("https://gitlab.gnome.org/GNOME/gtk/-/archive/${pkgver}/gtk-${pkgver}.ta 'gtk4.install' 'gtk4-update-icon-cache.hook' 'gtk4-update-icon-cache.script' + 'gtk4-vulkan-fix.patch' 'settings.ini') -sha512sums=('8fc9e00dd0f5dda2d03ae9023684eebe9cc827e4a742320c3bc6dd62b3e03892f1b29aafb8167402c238ed7b4776e5bea532d8243142ae8da986e9779d17a9c8' +sha512sums=('efb98b6aea62eb209d5e6fc507b8f0ae73a0d226d6fbd1a5a0b7b5e68c2e12a89cbf13da78fc5ee31f3fce36e83e74ea8aa4fb29084e66fe148e6e2ed3b46cdb' '5dcb698a15e7d5f4611c9357782d475052944cc71e73351238ffb5dfbe18d1bd1b62289da7f8066cde256c4339de5efa982088f47781876f5d8317f92b87f79f' '9d3bb80afb3a00dc50402d32476719daaeab017e1a066425bb602316b534d0a9899d48734a84f70af1066ed104df0491264383a34969dfad2ea9828fb41b9b6b' '805cf12606c738d0442d8af415223d3faada93c933b563b7c4c1d5e0c16d2d21435406add1fcc69300fb2fe534f2d0ddbf50b2c0463fc7462109d0f7802ccef1' + 'b2073af14459a1cb23dd68fc62dd04fc560fdceee4ac6da24824da2f47ea5e663a6a28b700b9cabf0c24829227bc7fb9e95a06f568a2db74c5830b78fd922d36' '1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685') install=gtk4.install +prepare() { + cd gtk-${pkgver} + patch gdk/gdkvulkancontext.c < ../gtk4-vulkan-fix.patch + } + build() { cd gtk-${pkgver} diff --git a/gtk4-vulkan-fix.patch b/gtk4-vulkan-fix.patch new file mode 100644 index 0000000..0bdf004 --- /dev/null +++ b/gtk4-vulkan-fix.patch @@ -0,0 +1,13 @@ +--- gdk/gdkvulkancontext-old.c 2020-12-17 07:51:26.864869286 +0100 ++++ gdk/gdkvulkancontext.c 2020-12-17 07:51:44.211704212 +0100 +@@ -210,8 +210,10 @@ + return "An unknown error has occurred; either the application has provided invalid input, or an implementation failure has occurred."; + #endif + #if VK_HEADER_VERSION >= 135 ++#if VK_HEADER_VERSION < 162 + case VK_ERROR_INCOMPATIBLE_VERSION_KHR: + return "Acceleration structure serialized with version as the version information is not compatible with device."; ++#endif + case VK_THREAD_IDLE_KHR: + return "A deferred operation is not complete but there is currently no work for this thread to do at the time of this call."; + case VK_THREAD_DONE_KHR: -- 2.29.2 [1] https://aur.archlinux.org/account/karrikuh/ [2] https://aur.archlinux.org/pkgbase/gtk4/