[arch-commits] Commit in gtk3/trunk (4 files)

[Jan Steffens]

    Date: Saturday, April 30, 2016 @ 00:34:50
  Author: heftig
Revision: 266658

3.20.3-4

Added:
  gtk3/trunk/gtk-query-immodules-3.0.hook
Modified:
  gtk3/trunk/PKGBUILD
  gtk3/trunk/gtk3.install
Deleted:
  gtk3/trunk/gtk-update-icon-cache.install

-------------------------------+
 PKGBUILD                      |   18 ++++++++++--------
 gtk-query-immodules-3.0.hook  |   11 +++++++++++
 gtk-update-icon-cache.install |    3 ---
 gtk3.install                  |   15 ---------------
 4 files changed, 21 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-29 22:32:19 UTC (rev 266657)
+++ PKGBUILD	2016-04-29 22:34:50 UTC (rev 266658)
@@ -5,21 +5,23 @@
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
 pkgver=3.20.3
-pkgrel=3
+pkgrel=4
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
          libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon
-         adwaita-icon-theme json-glib rest librsvg wayland-protocols)
+         adwaita-icon-theme json-glib rest librsvg wayland-protocols desktop-file-utils)
 makedepends=(gobject-introspection libcanberra gtk-doc)
 license=(LGPL)
 source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
         settings.ini
+        gtk-query-immodules-3.0.hook
         gtk-update-icon-cache.hook
         gtk-update-icon-cache.script)
 sha256sums=('3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
             '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
             'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb')
 
@@ -52,7 +54,9 @@
 
     cd "gtk+-$pkgver"
     make DESTDIR="$pkgdir" install
+
     install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+    install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
 
     # split this out to use with gtk2 too
     rm "$pkgdir/usr/bin/gtk-update-icon-cache"
@@ -61,13 +65,11 @@
 package_gtk-update-icon-cache() {
     pkgdesc="GTK+ icon cache updater"
     depends=(gdk-pixbuf2 hicolor-icon-theme)
-    install=gtk-update-icon-cache.install
 
-    cd gtk+-$pkgver/gtk
-    install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
-
-    install -Dm644 "$srcdir"/gtk-update-icon-cache.hook "$pkgdir"/usr/share/libalpm/hooks/gtk-update-icon-cache.hook
-    install -Dm755 "$srcdir"/gtk-update-icon-cache.script "$pkgdir"/usr/share/libalpm/scripts/gtk-update-icon-cache
+    cd gtk+-$pkgver
+    install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+    install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+    install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
 }
 
 # vim:set et sw=4:

Added: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook	                        (rev 0)
+++ gtk-query-immodules-3.0.hook	2016-04-29 22:34:50 UTC (rev 266658)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache

Deleted: gtk-update-icon-cache.install
===================================================================
--- gtk-update-icon-cache.install	2016-04-29 22:32:19 UTC (rev 266657)
+++ gtk-update-icon-cache.install	2016-04-29 22:34:50 UTC (rev 266658)
@@ -1,3 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}

Modified: gtk3.install
===================================================================
--- gtk3.install	2016-04-29 22:32:19 UTC (rev 266657)
+++ gtk3.install	2016-04-29 22:34:50 UTC (rev 266658)
@@ -1,18 +1,3 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-    /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
 pre_remove() {
     rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
 }
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-    /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}