3.24.35

2 files changed, 80 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04e3d42128db..d12d25460f20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,46 @@
 pkgbase = gtk3-no_deadkeys_underline
-	pkgdesc = Like gtk3 in extra but with a patch to disable dead keys having an underline below them while typing
-	pkgver = 3.24.34
-	pkgrel = 1
+	pkgdesc = Like gtk3 in extra but with a patch to disable dead keys having an underline below them while typing and also without tracker3
+	pkgver = 3.24.35
+	pkgrel = 2
 	epoch = 1
 	url = https://www.gtk.org/
 	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 = desktop-file-utils
+	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 = at-spi2-atk
 	depends = wayland
-	depends = libxkbcommon
-	depends = adwaita-icon-theme
-	depends = json-glib
-	depends = librsvg
-	depends = wayland-protocols
-	depends = desktop-file-utils
-	depends = mesa
-	depends = cantarell-fonts
-	depends = libcolord
-	depends = rest
-	depends = libcups
-	depends = fribidi
-	depends = iso-codes
-	depends = libcloudproviders
-	depends = gtk-update-icon-cache
 	optdepends = evince: Default print preview command
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
@@ -53,7 +51,7 @@ pkgbase = gtk3-no_deadkeys_underline
 	conflicts = gtk3
 	replaces = gtk3-print-backends<=3.22.26-1
 	options = debug
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=4e3a3f05533789e1a68c70c185e1755d386d6c47
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119
 	source = gtk-query-immodules-3.0.hook
 	source = no_deadkeys_underline.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b7bcdf0e3aad..e0432bd6e28a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,50 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-no_deadkeys_underline
-pkgver=3.24.34
-pkgrel=1
+pkgver=3.24.35
+pkgrel=2
 epoch=1
-pkgdesc="Like gtk3 in extra but with a patch to disable dead keys having an underline below them while typing"
+pkgdesc="Like gtk3 in extra but with a patch to disable dead keys having an underline below them while typing and also without tracker3"
 arch=(x86_64)
 url="https://www.gtk.org/"
-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 json-glib librsvg
-         wayland-protocols desktop-file-utils mesa cantarell-fonts libcolord
-         rest libcups fribidi iso-codes libcloudproviders
-         gtk-update-icon-cache)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+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
+  wayland
+)
+makedepends=(
+  git
+  glib2-docs
+  gobject-introspection
+  gtk-doc
+  meson
+  sassc
+  wayland-protocols
+)
 optdepends=('evince: Default print preview command')
 provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so gtk3)
 conflicts=(gtk3-print-backends gtk3)
@@ -23,7 +54,7 @@ replaces=("gtk3-print-backends<=3.22.26-1")
 license=(LGPL)
 options=(debug)
 install=gtk3.install
-_commit=4e3a3f05533789e1a68c70c185e1755d386d6c47 # tags/3.24.34^0
+_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119  # tags/3.24.35^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk-query-immodules-3.0.hook
         no_deadkeys_underline.patch
@@ -41,19 +72,28 @@ pkgver() {
 prepare() {
   cd gtk
   patch -p1 < ../no_deadkeys_underline.patch
+
+  # 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
 }
 
 build() {
-  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
   local meson_options=(
     -D broadway_backend=true
     -D cloudproviders=true
     -D tracker3=false
     -D colord=yes
     -D gtk_doc=true
+    -D introspection=true
     -D man=true
   )
 
+  CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
   arch-meson gtk build "${meson_options[@]}"
   meson compile -C build
 }
@@ -69,7 +109,7 @@ _pick() {
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 
   install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-3.0/settings.ini" <<END
 [Settings]