[arch-commits] Commit in gtk2/trunk (PKGBUILD gtk2.install)

[Jan Steffens]

    Date: Thursday, July 4, 2013 @ 23:12:15
  Author: heftig
Revision: 189694

2.24.20

Modified:
  gtk2/trunk/PKGBUILD
  gtk2/trunk/gtk2.install

--------------+
 PKGBUILD     |    4 ++--
 gtk2.install |   11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-04 20:21:11 UTC (rev 189693)
+++ PKGBUILD	2013-07-04 21:12:15 UTC (rev 189694)
@@ -3,7 +3,7 @@
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.19
+pkgver=2.24.20
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,7 +13,7 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         xid-collision-debug.patch)
-sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8'
+sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {

Modified: gtk2.install
===================================================================
--- gtk2.install	2013-07-04 20:21:11 UTC (rev 189693)
+++ gtk2.install	2013-07-04 21:12:15 UTC (rev 189694)
@@ -1,16 +1,17 @@
 post_install() {
-  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+    /usr/bin/gtk-query-immodules-2.0 --update-cache
 }
 
 pre_upgrade() {
-  pre_remove
+    if (( $(vercmp $2 2.24.20) < 0 )); then
+        rm -f /etc/gtk-2.0/gtk.immodules
+    fi
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }
 
 pre_remove() {
-  rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
 }