[arch-commits] Commit in gtk4/trunk (6 files)

Sat Jan 9 18:44:02 UTC 2021

Date: Saturday, January 9, 2021 @ 18:44:01
  Author: heftig
Revision: 405869

4.0.1-1

Added:
  gtk4/trunk/gtk-update-icon-cache.hook
    (from rev 405868, gtk4/trunk/gtk4-update-icon-cache.hook)
  gtk4/trunk/gtk-update-icon-cache.script
    (from rev 405868, gtk4/trunk/gtk4-update-icon-cache.script)
Modified:
  gtk4/trunk/PKGBUILD
Deleted:
  gtk4/trunk/gtk4-update-icon-cache.hook
  gtk4/trunk/gtk4-update-icon-cache.script
  gtk4/trunk/vulkan-fix.diff

-------------------------------+
 PKGBUILD                      |   31 ++++++++++---------------------
 gtk-update-icon-cache.hook    |   13 +++++++++++++
 gtk-update-icon-cache.script  |   10 ++++++++++
 gtk4-update-icon-cache.hook   |   13 -------------
 gtk4-update-icon-cache.script |   10 ----------
 vulkan-fix.diff               |   15 ---------------
 6 files changed, 33 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2021-01-09 17:09:36 UTC (rev 405868)
+++ PKGBUILD	2021-01-09 18:44:01 UTC (rev 405869)
@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgbase=gtk4
-pkgname=(gtk4 gtk4-update-icon-cache)
-pkgver=4.0.0
+pkgname=(gtk4 gtk-update-icon-cache)
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(x86_64)
@@ -17,16 +17,14 @@
 makedepends=(git meson gtk-doc glib2-docs wayland-protocols vulkan-headers
              sysprof python shaderc sassc gobject-introspection pandoc)
 license=(LGPL)
-_commit=591c2f05956935adbebed5fc345a309dde2d449c  # tags/4.0.0^0
+_commit=60835227a1ff24512c98b2da608979b426329d87  # tags/4.0.1^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        vulkan-fix.diff
         gtk-query-immodules-4.0.hook
-        gtk4-update-icon-cache.{hook,script})
+        gtk-update-icon-cache.{hook,script})
 sha256sums=('SKIP'
-            'b92488d5a0b078e1f3ec4a5f9ffd7bdb17690aca447cc2da1c9281478ac51d36'
             '1e6a448b7d02d95d4ee8cdedb5052cc764a03e3cf6d7d755bff22793aba200a7'
-            'f81264107299efae62932f542a5661bef8d4e9de1c8137007cf231f0cfb085c2'
-            'de9d96decf15d0ce7d69616425146f5f850086a6f45cc8ac2ee74309408650cd')
+            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
+            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
 
 pkgver() {
   cd gtk
@@ -35,12 +33,6 @@
 
 prepare() {
   cd gtk
-
-  # Remove conflicting tag
-  git tag -d 4.0
-
-  # Fix build with vulkan-headers 162
-  git apply -3 ../vulkan-fix.diff
 }
 
 build() {
@@ -58,7 +50,7 @@
 }
 
 package_gtk4() {
-  depends+=(gtk4-update-icon-cache)
+  depends+=(gtk-update-icon-cache)
   provides+=(libgtk-4.so)
   install=gtk4.install
 
@@ -79,19 +71,16 @@
   mv {"$pkgdir",guic}/usr/share/man/man1/gtk4-update-icon-cache.1
 }
 
-package_gtk4-update-icon-cache() {
+package_gtk-update-icon-cache() {
   pkgdesc="GTK icon cache updater"
   depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
-  provides=("gtk-update-icon-cache=$pkgver")
-  conflicts=(gtk-update-icon-cache)
-  replaces=('gtk-update-icon-cache<4.0.0')
 
   mv -t "$pkgdir" guic/*
   ln -s gtk4-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
   ln -s gtk4-update-icon-cache.1 "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
 
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk4-update-icon-cache.hook
-  install -D gtk4-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk4-update-icon-cache"
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
+  install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
 }
 
 # vim:set ts=2 sw=2 et:

Copied: gtk4/trunk/gtk-update-icon-cache.hook (from rev 405868, gtk4/trunk/gtk4-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2021-01-09 18:44:01 UTC (rev 405869)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets

Copied: gtk4/trunk/gtk-update-icon-cache.script (from rev 405868, gtk4/trunk/gtk4-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2021-01-09 18:44:01 UTC (rev 405869)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+  if [[ -e ${f}index.theme ]]; then
+    gtk-update-icon-cache -q "$f"
+  elif [[ -d $f ]]; then
+    rm -f "${f}icon-theme.cache"
+    rmdir --ignore-fail-on-non-empty "$f"
+  fi
+done

Deleted: gtk4-update-icon-cache.hook
===================================================================
--- gtk4-update-icon-cache.hook	2021-01-09 17:09:36 UTC (rev 405868)
+++ gtk4-update-icon-cache.hook	2021-01-09 18:44:01 UTC (rev 405869)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk4-update-icon-cache
-NeedsTargets

Deleted: gtk4-update-icon-cache.script
===================================================================
--- gtk4-update-icon-cache.script	2021-01-09 17:09:36 UTC (rev 405868)
+++ gtk4-update-icon-cache.script	2021-01-09 18:44:01 UTC (rev 405869)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
-  if [[ -e ${f}index.theme ]]; then
-    gtk4-update-icon-cache -q "$f"
-  elif [[ -d $f ]]; then
-    rm -f "${f}icon-theme.cache"
-    rmdir --ignore-fail-on-non-empty "$f"
-  fi
-done

Deleted: vulkan-fix.diff
===================================================================
--- vulkan-fix.diff	2021-01-09 17:09:36 UTC (rev 405868)
+++ vulkan-fix.diff	2021-01-09 18:44:01 UTC (rev 405869)
@@ -1,15 +0,0 @@
-diff --git i/gdk/gdkvulkancontext.c w/gdk/gdkvulkancontext.c
-index 917b443f94..8e49fedc9a 100644
---- i/gdk/gdkvulkancontext.c
-+++ w/gdk/gdkvulkancontext.c
-@@ -210,8 +210,10 @@ 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
-+# 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:

