upgpkg: gtk4 4.0.0

3 files changed, 48 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a3e0c6a1394..ae194406e266 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Nov 19 10:57:45 UTC 2020
 pkgbase = gtk4
 	pkgdesc = GObject-based multi-platform GUI toolkit
-	pkgver = 3.99.4
-	pkgrel = 2
+	pkgver = 4.0.0
+	pkgrel = 1
 	url = https://www.gtk.org/
 	install = gtk4.install
 	arch = i686
@@ -50,16 +48,18 @@ pkgbase = gtk4
 	conflicts = gtk4-update-icon-cache
 	replaces = gtk4-print-backends
 	replaces = gtk4-update-icon-cache
-	source = https://gitlab.gnome.org/GNOME/gtk/-/archive/3.99.4/gtk-3.99.4.tar.gz
+	source = https://download.gnome.org/sources/gtk/4.0/gtk-4.0.0.tar.xz
 	source = gtk4.install
 	source = gtk4-update-icon-cache.hook
 	source = gtk4-update-icon-cache.script
 	source = settings.ini
-	sha512sums = 8fc9e00dd0f5dda2d03ae9023684eebe9cc827e4a742320c3bc6dd62b3e03892f1b29aafb8167402c238ed7b4776e5bea532d8243142ae8da986e9779d17a9c8
+	source = fix-incompatible-vulkan-error.patch
+	sha512sums = 5fe807bcdb59f0df2ad1cc5a28b654dbf90f5fa29bf9a4c69c9278543ab9a3e4f8b1712547fb2fd1f35711c438f78ee8a5cd1a509cf64f815274bb8c82023922
 	sha512sums = 5dcb698a15e7d5f4611c9357782d475052944cc71e73351238ffb5dfbe18d1bd1b62289da7f8066cde256c4339de5efa982088f47781876f5d8317f92b87f79f
 	sha512sums = 9d3bb80afb3a00dc50402d32476719daaeab017e1a066425bb602316b534d0a9899d48734a84f70af1066ed104df0491264383a34969dfad2ea9828fb41b9b6b
 	sha512sums = 805cf12606c738d0442d8af415223d3faada93c933b563b7c4c1d5e0c16d2d21435406add1fcc69300fb2fe534f2d0ddbf50b2c0463fc7462109d0f7802ccef1
 	sha512sums = 1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685
+	sha512sums = 2abb3e5c0743992bdffb5cdb2a9256577acba1e3da39971921e013d9d197dbbc5dd29555176f558a2176bd2a2853fd6370b8e7004257c4d001d3211694a9b9c3
 
 pkgname = gtk4
 
diff --git a/PKGBUILD b/PKGBUILD
index 96719fbe2aa0..3f5f2de628ae 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/"
@@ -45,18 +45,25 @@ makedepends=('gobject-introspection'
 optdepends=('gnome-icon-theme: Default icon theme'
             'gnome-themes-standard: Default widget theme'
             'gdk-pixbuf2: An image loading library')
-source=("https://gitlab.gnome.org/GNOME/gtk/-/archive/${pkgver}/gtk-${pkgver}.tar.gz"
+source=("https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-${pkgver}.tar.xz"
         'gtk4.install'
         'gtk4-update-icon-cache.hook'
         'gtk4-update-icon-cache.script'
-        'settings.ini')
-sha512sums=('8fc9e00dd0f5dda2d03ae9023684eebe9cc827e4a742320c3bc6dd62b3e03892f1b29aafb8167402c238ed7b4776e5bea532d8243142ae8da986e9779d17a9c8'
+        'settings.ini'
+        'fix-incompatible-vulkan-error.patch')
+sha512sums=('5fe807bcdb59f0df2ad1cc5a28b654dbf90f5fa29bf9a4c69c9278543ab9a3e4f8b1712547fb2fd1f35711c438f78ee8a5cd1a509cf64f815274bb8c82023922'
             '5dcb698a15e7d5f4611c9357782d475052944cc71e73351238ffb5dfbe18d1bd1b62289da7f8066cde256c4339de5efa982088f47781876f5d8317f92b87f79f'
             '9d3bb80afb3a00dc50402d32476719daaeab017e1a066425bb602316b534d0a9899d48734a84f70af1066ed104df0491264383a34969dfad2ea9828fb41b9b6b'
             '805cf12606c738d0442d8af415223d3faada93c933b563b7c4c1d5e0c16d2d21435406add1fcc69300fb2fe534f2d0ddbf50b2c0463fc7462109d0f7802ccef1'
-            '1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685')
+            '1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685'
+            '2abb3e5c0743992bdffb5cdb2a9256577acba1e3da39971921e013d9d197dbbc5dd29555176f558a2176bd2a2853fd6370b8e7004257c4d001d3211694a9b9c3')
 install=gtk4.install
 
+prepare() {
+  cd gtk-${pkgver}
+  patch -p1 -i "$srcdir"/fix-incompatible-vulkan-error.patch
+}
+
 build() {
   cd gtk-${pkgver}
 
diff --git a/fix-incompatible-vulkan-error.patch b/fix-incompatible-vulkan-error.patch
new file mode 100644
index 000000000000..c8c678c6324c
--- /dev/null
+++ b/fix-incompatible-vulkan-error.patch
@@ -0,0 +1,29 @@
+From 3c2484142dabb1dc141a36e790e79ac6ace88436 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
+Date: Tue, 15 Dec 2020 15:04:48 +0100
+Subject: [PATCH] vulkancontext: Remove usage of
+ VK_ERROR_INCOMPATIBLE_VERSION_KHR
+
+According to
+https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/chap46.html
+this has been removed. It also breaks the build on my system
+---
+ gdk/gdkvulkancontext.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
+index 917b443f94..d0e47055c9 100644
+--- a/gdk/gdkvulkancontext.c
++++ b/gdk/gdkvulkancontext.c
+@@ -210,8 +210,6 @@ gdk_vulkan_strerror (VkResult result)
+       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
+-    case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
+-      return "Acceleration structure serialized with version as the version information is not compatible with device.";
+     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:
+-- 
+GitLab
+