3.24.34+r156+g812b3930d0-1

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd827b2702eb..2540a627c95b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
-	pkgver = 3.24.34+r154+g56100ab49a
+	pkgver = 3.24.34+r156+g812b3930d0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Dudemanguy/gtk
@@ -44,7 +44,7 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = gtk-update-icon-cache
 	optdepends = evince: Default print preview command
 	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk3=3.24.34+r154+g56100ab49a
+	provides = gtk3=3.24.34+r156+g812b3930d0
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
@@ -52,7 +52,7 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	conflicts = gtk3
 	conflicts = gtk3-print-backends
 	replaces = gtk3-print-backends<=3.22.26-1
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=56100ab49ab729f1d98b66e84f3ed899a8105c43
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=812b3930d0bb11d67d4a2c159d037c8c0d440c50
 	source = gtk-query-immodules-3.0.hook
 	source = gtk3-filechooser-icon-view.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7e03bf19c9f1..cf780e5bc412 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-patched-filechooser-icon-view
-pkgver=3.24.34+r154+g56100ab49a
+pkgver=3.24.34+r156+g812b3930d0
 pkgrel=1
 epoch=1
 pkgdesc="GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch."
@@ -24,7 +24,7 @@ conflicts=(gtk3 gtk3-print-backends)
 replaces=('gtk3-print-backends<=3.22.26-1')
 license=(LGPL)
 install=gtk3.install
-_commit=56100ab49ab729f1d98b66e84f3ed899a8105c43  # gtk-3-24
+_commit=812b3930d0bb11d67d4a2c159d037c8c0d440c50  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk-query-immodules-3.0.hook
         gtk3-filechooser-icon-view.patch)        
@@ -40,6 +40,10 @@ pkgver() {
 prepare() {
   cd gtk
 
+  # https://bugs.archlinux.org/task/76018
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4381#note_1465559
+  git revert -n da4066774b926880631af099469d308714b5606c
+
   # apply icon-view patch
   git apply -3 ../gtk3-filechooser-icon-view.patch
 }