3.24.36-1

2 files changed, 32 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a805a55677ac..47b37f6527db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
-	pkgver = 3.24.35
-	pkgrel = 2
+	pkgver = 3.24.36
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Dudemanguy/gtk
 	install = gtk3.install
@@ -15,7 +15,6 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	makedepends = sassc
 	makedepends = wayland-protocols
 	depends = adwaita-icon-theme
-	depends = at-spi2-atk
 	depends = atk
 	depends = cairo
 	depends = cantarell-fonts
@@ -23,36 +22,43 @@ pkgbase = gtk3-patched-filechooser-icon-view
 	depends = desktop-file-utils
 	depends = fribidi
 	depends = gdk-pixbuf2
+	depends = glib2
+	depends = harfbuzz
 	depends = gtk-update-icon-cache
 	depends = iso-codes
 	depends = libcloudproviders
 	depends = libcolord
 	depends = libcups
+	depends = libegl
 	depends = libepoxy
+	depends = libgl
 	depends = librsvg
 	depends = libxcomposite
+	depends = libx11
 	depends = libxcursor
 	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
 	depends = libxi
 	depends = libxinerama
 	depends = libxkbcommon
 	depends = libxrandr
-	depends = mesa
+	depends = libxrender
 	depends = pango
 	depends = shared-mime-info
 	depends = tracker3
 	depends = wayland
 	optdepends = evince: Default print preview command
 	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk3=3.24.35
+	provides = gtk3=3.24.36
 	provides = gtk3-print-backends
-	provides = libgtk-3.so
-	provides = libgdk-3.so
 	provides = libgailutil-3.so
+	provides = libgdk-3.so
+	provides = libgtk-3.so
 	conflicts = gtk3
 	conflicts = gtk3-print-backends
 	replaces = gtk3-print-backends<=3.22.26-1
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=35516a5e866cd77390eb71d72d5b67f45dc4302c
 	source = gtk-query-immodules-3.0.hook
 	source = gtk3-filechooser-icon-view.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 955b2618077e..2242b1d4fd85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,14 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-patched-filechooser-icon-view
-pkgver=3.24.35
-pkgrel=2
+pkgver=3.24.36
+pkgrel=1
 epoch=1
 pkgdesc="GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch."
 arch=(x86_64)
 url="https://github.com/Dudemanguy/gtk"
 depends=(
   adwaita-icon-theme
-  at-spi2-atk
   atk
   cairo
   cantarell-fonts
@@ -20,21 +19,28 @@ depends=(
   desktop-file-utils
   fribidi
   gdk-pixbuf2
+  glib2
+  harfbuzz
   gtk-update-icon-cache
   iso-codes
   libcloudproviders
   libcolord
   libcups
+  libegl
   libepoxy
+  libgl
   librsvg
   libxcomposite
+  libx11
   libxcursor
   libxdamage
+  libxext
+  libxfixes
   libxi
   libxinerama
   libxkbcommon
   libxrandr
-  mesa
+  libxrender
   pango
   shared-mime-info
   tracker3
@@ -51,12 +57,18 @@ makedepends=(
 )
 optdepends=('evince: Default print preview command'
             'glib2-patched-thumbnailer: Thumbnail generation in upload dialog')
-provides=(gtk3=$pkgver gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+provides=(
+  gtk3=$pkgver
+  gtk3-print-backends
+  libgailutil-3.so
+  libgdk-3.so
+  libgtk-3.so
+)
 conflicts=(gtk3 gtk3-print-backends)
 replaces=('gtk3-print-backends<=3.22.26-1')
 license=(LGPL)
 install=gtk3.install
-_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119  # tags/3.24.35^0
+_commit=35516a5e866cd77390eb71d72d5b67f45dc4302c  # tags/3.24.36^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
   gtk-query-immodules-3.0.hook
@@ -74,14 +86,6 @@ pkgver() {
 prepare() {
   cd gtk
 
-  # Crash in gnome-screenshot
-  # https://gitlab.gnome.org/GNOME/gtk/-/issues/4456
-  git cherry-pick -n e413f5c43259a22269aa1e75767dd545e10119b5
-
-  # https://bugs.archlinux.org/task/76651
-  # https://gitlab.gnome.org/GNOME/gtk/-/issues/5365
-  git cherry-pick -n 3f1536632f682c355d0c3abe1afc80cf975c2cce
-
   # apply icon-view patch
   git apply -3 ../gtk3-filechooser-icon-view.patch
 }