2.24.32-2

4 files changed, 22 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c4e4bb9ee33..ce4598b72ff8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = gtk2-patched-filechooser-icon-view
-	pkgdesc = GTK2 patched with ahodesuka's filechooser-icon-view patch.
-	pkgver = 2.24.32+34+g664537d618
+	pkgdesc = https://github.com/Dudemanguy/gtk/tree/gtk2-filechooser-icon-view
+	pkgver = 2.24.32
 	pkgrel = 2
 	url = https://gist.github.com/Dudemanguy911/d70734d5bdf82e79cbfb22894fac8a1b/
 	install = gtk2.install
 	arch = x86_64
 	license = LGPL
 	makedepends = gobject-introspection
-	makedepends = python2
 	makedepends = git
 	makedepends = gtk-doc
 	depends = atk
@@ -26,9 +25,12 @@ pkgbase = gtk2-patched-filechooser-icon-view
 	depends = desktop-file-utils
 	depends = gtk-doc
 	optdepends = gnome-themes-standard: Default widget theme
-	optdepends = gnome-icon-theme: Default icon theme
-	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk2=2.24.32+34+g664537d618
+	optdepends = adwaita-icon-theme: Default icon theme
+	optdepends = python2: gtk-builder-convert
+	provides = gtk2=2.24.32
+	provides = libgailutil.so
+	provides = libgdk-x11-2.0.so
+	provides = libgtk-x11-2.0.so
 	conflicts = gtk2
 	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=664537d6185800d7603438d4b9e18fbc6256ad41
 	source = gtkrc
@@ -36,8 +38,8 @@ pkgbase = gtk2-patched-filechooser-icon-view
 	source = xid-collision-debug.patch
 	source = gtk2-filechooser-icon-view.patch
 	sha256sums = SKIP
-	sha256sums = b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2
-	sha256sums = 9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758
+	sha256sums = bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805
+	sha256sums = 427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425
 	sha256sums = d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558
 	sha256sums = 91e5c18be6dffc05af41561b38934259494bc14041a9c1d91b0b9b1a1dcd2be5
 
diff --git a/PKGBUILD b/PKGBUILD
index 6305045604e6..b5fc59e78cad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk2-patched-filechooser-icon-view
-pkgver=2.24.32+34+g664537d618
+pkgver=2.24.32
 pkgrel=2
 arch=(x86_64)
-pkgdesc="GTK2 patched with ahodesuka's filechooser-icon-view patch."
+pkgdesc="https://github.com/Dudemanguy/gtk/tree/gtk2-filechooser-icon-view"
 url="https://gist.github.com/Dudemanguy911/d70734d5bdf82e79cbfb22894fac8a1b/"
-provides=("gtk2=$pkgver")
+provides=(gtk2=$pkgver libgailutil.so libg{d,t}k-x11-2.0.so)
 conflicts=('gtk2')
 depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
          'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'librsvg'
          'desktop-file-utils' 'gtk-doc')
-makedepends=('gobject-introspection' 'python2' 'git' 'gtk-doc')
-optdepends=('gnome-themes-standard: Default widget theme' 
-            'gnome-icon-theme: Default icon theme'
-			'glib2-patched-thumbnailer: Thumbnail generation in upload dialog')
+makedepends=(gobject-introspection git gtk-doc)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'adwaita-icon-theme: Default icon theme'
+            'python2: gtk-builder-convert')
 license=('LGPL')
 install=gtk2.install
 _commit=664537d6185800d7603438d4b9e18fbc6256ad41 # gtk-2-24
@@ -27,17 +27,14 @@ source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk2-filechooser-icon-view.patch)
 
 sha256sums=('SKIP'
-            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
-            '9656a1efc798da1ac2dae94e921ed0f72719bd52d4d0138f305b993f778f7758'
+            'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
+            '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
             '91e5c18be6dffc05af41561b38934259494bc14041a9c1d91b0b9b1a1dcd2be5')
-pkgver() {
-  cd gtk
-  git describe --tags | sed 's/-/+/g'
-}
 
 prepare() {
   cd gtk
+  git cherry-pick -n 2dbf31c0ea4f17a817b931c731f8de14c278300d
   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
diff --git a/gtk-query-immodules-2.0.hook b/gtk-query-immodules-2.0.hook
index 40a0aa747b93..51986eb2856e 100644
--- a/gtk-query-immodules-2.0.hook
+++ b/gtk-query-immodules-2.0.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove
diff --git a/gtkrc b/gtkrc
index d2282ac36e5f..1ee9497d946f 100644
--- a/gtkrc
+++ b/gtkrc
@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "gnome"
+gtk-icon-theme-name = "Adwaita"
 gtk-theme-name = "Adwaita"
 gtk-font-name = "Cantarell 11"