3.24.35-2

2 files changed, 85 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2540a627c95b..a805a55677ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,50 @@
 pkgbase = gtk3-patched-filechooser-icon-view
 	pkgdesc = GTK3 patched with dudemanguy's fork of wfr's filechooser-icon-view patch.
-	pkgver = 3.24.34+r156+g812b3930d0
-	pkgrel = 1
+	pkgver = 3.24.35
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/Dudemanguy/gtk
 	install = gtk3.install
 	arch = x86_64
 	license = LGPL
-	makedepends = gobject-introspection
-	makedepends = gtk-doc
 	makedepends = git
 	makedepends = glib2-docs
-	makedepends = sassc
+	makedepends = gobject-introspection
+	makedepends = gtk-doc
 	makedepends = meson
+	makedepends = sassc
 	makedepends = wayland-protocols
+	depends = adwaita-icon-theme
+	depends = at-spi2-atk
 	depends = atk
 	depends = cairo
-	depends = libxcursor
-	depends = libxinerama
-	depends = libxrandr
-	depends = libxi
-	depends = libepoxy
-	depends = gdk-pixbuf2
+	depends = cantarell-fonts
 	depends = dconf
-	depends = libxcomposite
-	depends = libxdamage
-	depends = pango
-	depends = shared-mime-info
-	depends = at-spi2-atk
-	depends = wayland
-	depends = libxkbcommon
-	depends = adwaita-icon-theme
-	depends = librsvg
 	depends = desktop-file-utils
-	depends = mesa
-	depends = cantarell-fonts
-	depends = libcolord
-	depends = libcups
 	depends = fribidi
+	depends = gdk-pixbuf2
+	depends = gtk-update-icon-cache
 	depends = iso-codes
 	depends = libcloudproviders
+	depends = libcolord
+	depends = libcups
+	depends = libepoxy
+	depends = librsvg
+	depends = libxcomposite
+	depends = libxcursor
+	depends = libxdamage
+	depends = libxi
+	depends = libxinerama
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = mesa
+	depends = pango
+	depends = shared-mime-info
 	depends = tracker3
-	depends = gtk-update-icon-cache
+	depends = wayland
 	optdepends = evince: Default print preview command
 	optdepends = glib2-patched-thumbnailer: Thumbnail generation in upload dialog
-	provides = gtk3=3.24.34+r156+g812b3930d0
+	provides = gtk3=3.24.35
 	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=812b3930d0bb11d67d4a2c159d037c8c0d440c50
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119
 	source = gtk-query-immodules-3.0.hook
 	source = gtk3-filechooser-icon-view.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cf780e5bc412..955b2618077e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,64 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-patched-filechooser-icon-view
-pkgver=3.24.34+r156+g812b3930d0
-pkgrel=1
+pkgver=3.24.35
+pkgrel=2
 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=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
-         dconf libxcomposite libxdamage pango shared-mime-info at-spi2-atk
-         wayland libxkbcommon adwaita-icon-theme librsvg desktop-file-utils
-         mesa cantarell-fonts libcolord libcups fribidi iso-codes
-         libcloudproviders tracker3 gtk-update-icon-cache)
+depends=(
+  adwaita-icon-theme
+  at-spi2-atk
+  atk
+  cairo
+  cantarell-fonts
+  dconf
+  desktop-file-utils
+  fribidi
+  gdk-pixbuf2
+  gtk-update-icon-cache
+  iso-codes
+  libcloudproviders
+  libcolord
+  libcups
+  libepoxy
+  librsvg
+  libxcomposite
+  libxcursor
+  libxdamage
+  libxi
+  libxinerama
+  libxkbcommon
+  libxrandr
+  mesa
+  pango
+  shared-mime-info
+  tracker3
+  wayland
+)
+makedepends=(
+  git
+  glib2-docs
+  gobject-introspection
+  gtk-doc
+  meson
+  sassc
+  wayland-protocols
+)
 optdepends=('evince: Default print preview command'
             'glib2-patched-thumbnailer: Thumbnail generation in upload dialog')
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
-             wayland-protocols)
 provides=(gtk3=$pkgver gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
 conflicts=(gtk3 gtk3-print-backends)
 replaces=('gtk3-print-backends<=3.22.26-1')
 license=(LGPL)
 install=gtk3.install
-_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)        
+_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119  # tags/3.24.35^0
+source=(
+  "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+  gtk-query-immodules-3.0.hook
+  gtk3-filechooser-icon-view.patch
+)
 sha256sums=('SKIP'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '7a1730f08649b769cbaf24432ec176cefb55a5e81dc969a8242152718cb72eea')
@@ -40,26 +74,31 @@ 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
+  # 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
 }
 
 build() {
-  CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
   local meson_options=(
     -D broadway_backend=true
     -D cloudproviders=true
-    -D tracker3=true
     -D colord=yes
     -D gtk_doc=false
+    -D introspection=true
     -D demos=false
     -D man=true
+    -D tracker3=true
   )
 
+  CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
   arch-meson gtk build "${meson_options[@]}"
   meson compile -C build
 }
@@ -81,3 +120,4 @@ END
   rm $pkgdir/usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
 }
 
+# vim:set sw=2 sts=-1 et: