fixing stuff per upstream

4 files changed, 5 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4353e97d8cb1..7f3c93915b63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,22 +26,19 @@ pkgbase = gtk3-git
 	depends = shared-mime-info
 	depends = wayland
 	depends = wayland-protocols
+	depends = gtk-update-icon-cache
 	optdepends = gnome-icon-theme: Default icon theme
 	optdepends = gnome-themes-standard: Default widget theme
 	provides = gtk3=3.24.38.r84.g73d5663a8c
-	provides = gtk-update-icon-cache
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
 	provides = libgailutil-3.so
 	conflicts = gtk3
-	conflicts = gtk-update-icon-cache
 	backup = usr/share/gtk-3.0/settings.ini
 	source = git+https://gitlab.gnome.org/GNOME/gtk.git#branch=gtk-3-24
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
-	source = gtk-update-icon-cache.hook
-	source = gtk-update-icon-cache.script
 	sha256sums = SKIP
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229
diff --git a/PKGBUILD b/PKGBUILD
index 9d82752a2767..2e20e8a03886 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,18 +13,17 @@ depends=('at-spi2-atk' 'atk' 'cairo' 'colord' 'glib2'
          'gtk-update-icon-cache' 'libcups' 'libepoxy' 'libxcomposite'
          'libxcursor' 'libxdamage' 'libxi' 'libxinerama'
          'libxkbcommon' 'libxrandr' 'pango' 'shared-mime-info'
-         'wayland' 'wayland-protocols')
+         'wayland' 'wayland-protocols' 'gtk-update-icon-cache')
 makedepends=('gobject-introspection')
 optdepends=('gnome-icon-theme: Default icon theme'
             'gnome-themes-standard: Default widget theme')
-conflicts=('gtk3' 'gtk-update-icon-cache')
-provides=("gtk3=$pkgver" gtk-update-icon-cache gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+conflicts=('gtk3' )
+provides=("gtk3=$pkgver" gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
 backup=('usr/share/gtk-3.0/settings.ini')
 source=('git+https://gitlab.gnome.org/GNOME/gtk.git#branch=gtk-3-24'
         settings.ini
         gtk-query-immodules-3.0.hook
-        gtk-update-icon-cache.hook
-        gtk-update-icon-cache.script)
+  )
 sha256sums=('SKIP'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
@@ -63,7 +62,5 @@ package() {
   install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 ../settings.ini
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-3.0.hook
 
-  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"
 }
 
diff --git a/gtk-update-icon-cache.hook b/gtk-update-icon-cache.hook
deleted file mode 100644
index 758a62187a9b..000000000000
--- a/gtk-update-icon-cache.hook
+++ /dev/null
@@ -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/gtk-update-icon-cache
-NeedsTargets
diff --git a/gtk-update-icon-cache.script b/gtk-update-icon-cache.script
deleted file mode 100644
index ee0f1d12d0b7..000000000000
--- a/gtk-update-icon-cache.script
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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