3.24.37

2 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d12d25460f20..d3e6b6487748 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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 and also without tracker3
-	pkgver = 3.24.35
-	pkgrel = 2
+	pkgver = 3.24.37
+	pkgrel = 1
 	epoch = 1
 	url = https://www.gtk.org/
 	install = gtk3.install
@@ -15,29 +15,36 @@ pkgbase = gtk3-no_deadkeys_underline
 	makedepends = sassc
 	makedepends = wayland-protocols
 	depends = adwaita-icon-theme
-	depends = at-spi2-atk
 	depends = atk
 	depends = cairo
 	depends = cantarell-fonts
 	depends = dconf
 	depends = desktop-file-utils
+	depends = fontconfig
 	depends = fribidi
 	depends = gdk-pixbuf2
 	depends = gtk-update-icon-cache
+	depends = glib2
+	depends = harfbuzz
 	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 = wayland
@@ -51,7 +58,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=14cf55f98ddd71ad3f91487eda1c7f14d67de119
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=013b629a2e5420cc01647f859226eb1a37ebe661
 	source = gtk-query-immodules-3.0.hook
 	source = no_deadkeys_underline.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e0432bd6e28a..f221945e250b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,44 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3-no_deadkeys_underline
-pkgver=3.24.35
-pkgrel=2
+pkgver=3.24.37
+pkgrel=1
 epoch=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"
 arch=(x86_64)
 url="https://www.gtk.org/"
 depends=(
   adwaita-icon-theme
-  at-spi2-atk
   atk
   cairo
   cantarell-fonts
   dconf
   desktop-file-utils
+  fontconfig
   fribidi
   gdk-pixbuf2
   gtk-update-icon-cache
+  glib2
+  harfbuzz
   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
   wayland
@@ -54,7 +61,7 @@ replaces=("gtk3-print-backends<=3.22.26-1")
 license=(LGPL)
 options=(debug)
 install=gtk3.install
-_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119  # tags/3.24.35^0
+_commit=013b629a2e5420cc01647f859226eb1a37ebe661  # tags/3.24.37^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk-query-immodules-3.0.hook
         no_deadkeys_underline.patch
@@ -72,14 +79,6 @@ 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() {