update

3 files changed, 35 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 980b812d2468..1003ca126907 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Mar 27 04:52:03 UTC 2016
+# Sun May  8 09:44:26 UTC 2016
 pkgbase = gtk2-patched-filechooser-icon-view
 	pkgdesc = GTK2 patched with ahodesuka's filechooser-icon-view patch.
 	pkgver = 2.24.30
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gist.github.com/ahodesuka/01213036b58e510dc074
 	install = gtk2.install
 	arch = i686
@@ -23,6 +23,8 @@ pkgbase = gtk2-patched-filechooser-icon-view
 	depends = cairo
 	depends = libcups
 	depends = gtk-update-icon-cache
+	depends = librsvg
+	depends = desktop-file-utils
 	depends = glib2-patched-thumbnailer
 	optdepends = gnome-themes-standard: Default widget theme
 	optdepends = gnome-icon-theme: Default icon theme
@@ -30,13 +32,15 @@ pkgbase = gtk2-patched-filechooser-icon-view
 	conflicts = gtk2
 	replaces = gtk2-docs
 	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.30.tar.xz
+	source = https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/d60e3f1330f3044aeffad8516adc3c444e751b2f/gtk2-filechooser-icon-view.patch
 	source = gtkrc
+	source = gtk-query-immodules-2.0.hook
 	source = xid-collision-debug.patch
-	source = https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/d60e3f1330f3044aeffad8516adc3c444e751b2f/gtk2-filechooser-icon-view.patch
 	sha256sums = 0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50
+	sha256sums = 2e15a62578f152d040d716b356411825efe222743f6e813ed7dd1d0c1a12bb50
 	sha256sums = b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2
+	sha256sums = 9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758
 	sha256sums = d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558
-	sha256sums = 2e15a62578f152d040d716b356411825efe222743f6e813ed7dd1d0c1a12bb50
 
 pkgname = gtk2-patched-filechooser-icon-view
 
diff --git a/PKGBUILD b/PKGBUILD
index 621ada4b1415..b45825bc996a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,37 @@ pkgbase=gtk2-patched-filechooser-icon-view
 pkgname=gtk2-patched-filechooser-icon-view
 pkgver=2.24.30
 _patchver=d60e3f1330f3044aeffad8516adc3c444e751b2f
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="GTK2 patched with ahodesuka's filechooser-icon-view patch."
 url="https://gist.github.com/ahodesuka/01213036b58e510dc074"
 provides=("gtk2=$pkgver")
 conflicts=('gtk2')
 install=gtk2.install
-depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 
-         'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'glib2-patched-thumbnailer')
+depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
+         'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'librsvg'
+         'desktop-file-utils' 'glib2-patched-thumbnailer')
 makedepends=('gobject-introspection' 'python2')
 optdepends=('gnome-themes-standard: Default widget theme' 
             'gnome-icon-theme: Default icon theme')
 replaces=('gtk2-docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        gtkrc xid-collision-debug.patch
-        https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/$_patchver/gtk2-filechooser-icon-view.patch)
+        https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/$_patchver/gtk2-filechooser-icon-view.patch
+        gtkrc
+        gtk-query-immodules-2.0.hook
+        xid-collision-debug.patch)
 sha256sums=('0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50'
+            '2e15a62578f152d040d716b356411825efe222743f6e813ed7dd1d0c1a12bb50'
             'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '2e15a62578f152d040d716b356411825efe222743f6e813ed7dd1d0c1a12bb50')
+            '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 prepare() {
     cd gtk+-$pkgver
     patch -Np1 -i ../xid-collision-debug.patch
     patch -Np1 -i $srcdir/gtk2-filechooser-icon-view.patch
+    sed -i '1s/python$/&2/' gtk/gtk-builder-convert
 }
 
 build() {
@@ -51,10 +56,9 @@ package() {
     cd gtk+-$pkgver
     make DESTDIR="$pkgdir" install
 
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    install -Dm644 ../gtkrc "$pkgdir/usr/share/gtk-2.0/gtkrc"
+    install -Dm644 ../gtk-query-immodules-2.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-2.0.hook"
 
-    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
-
-    #split this out to use with gtk3 too
-    rm $pkgdir/usr/bin/gtk-update-icon-cache
+    rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+    rm -r "$pkgdir/usr/share/gtk-doc"
 }
diff --git a/gtk-query-immodules-2.0.hook b/gtk-query-immodules-2.0.hook
new file mode 100644
index 000000000000..40a0aa747b93
--- /dev/null
+++ b/gtk-query-immodules-2.0.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-2.0/2.10.0/immodules/*.so
+
+[Action]
+Description = Probing GTK2 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-2.0 --update-cache