* update gtk2 to 2.24.33-5

gtk2/.SRCINFO

@@ -1,9 +1,8 @@
 pkgbase = gtk2
 	pkgdesc = GObject-based multi-platform GUI toolkit (legacy)
 	pkgver = 2.24.33
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.gtk.org/
-	install = gtk2.install
 	arch = x86_64
 	license = LGPL-2.1-or-later
 	makedepends = git
@@ -32,19 +31,20 @@ pkgbase = gtk2
 	depends = libxrender
 	depends = pango
 	depends = shared-mime-info
+	source = git+https://gitlab.gnome.org/GNOME/gtk.git#tag=2.24.33
+	source = gtk-query-immodules-2.0.hook
+	source = 0001-Lower-severity-of-XID-collision-warnings.patch
+	source = 0002-Stop-looking-for-modules-in-cwd.patch
+	b2sums = 1b18d1cfef55466209cf93be45af15dc058a8b74d13ab590cfc7f0b09b0584adc62d4330aaed65185c0142cc8c326e4274c8e75e0af94bec5be3cfcca105c1e6
+	b2sums = 9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096
+	b2sums = 45ecc976d9eb9d990fc204230aa052a6d1b2bdfdc94788be37d576ab262a1da49855eb46ecd4bfce4efde6e2f817a1660c6d1fa756be3b372f7f8d13b0ef0fd0
+	b2sums = 06ca1c6f0e8f6a7c7a3cc08ce3d358af978d28fc4aa8d9e981883e3ad5adf7d821bcb27bc8b93bf65171a92396ac8f7ad62c90db501a492cca7c30b6081e957f
+
+pkgname = gtk2
+	install = gtk2.install
 	optdepends = adwaita-icon-theme: Default icon theme
 	optdepends = gnome-themes-standard: Default widget theme
 	optdepends = python: gtk-builder-convert
 	provides = libgailutil.so
 	provides = libgdk-x11-2.0.so
 	provides = libgtk-x11-2.0.so
-	source = git+https://gitlab.gnome.org/GNOME/gtk.git#tag=2.24.33
-	source = gtkrc
-	source = gtk-query-immodules-2.0.hook
-	source = 0001-Lower-severity-of-XID-collision-warnings.patch
-	b2sums = 1b18d1cfef55466209cf93be45af15dc058a8b74d13ab590cfc7f0b09b0584adc62d4330aaed65185c0142cc8c326e4274c8e75e0af94bec5be3cfcca105c1e6
-	b2sums = 0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc
-	b2sums = 9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096
-	b2sums = 45ecc976d9eb9d990fc204230aa052a6d1b2bdfdc94788be37d576ab262a1da49855eb46ecd4bfce4efde6e2f817a1660c6d1fa756be3b372f7f8d13b0ef0fd0
-
-pkgname = gtk2

gtk2/0002-Stop-looking-for-modules-in-cwd.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 15 Jun 2024 14:18:01 -0400
+Subject: [PATCH] Stop looking for modules in cwd
+
+This is just not a good idea. It is surprising, and can be misused.
+
+Fixes: #6786
+---
+ gtk/gtkmodules.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
+index 50729b61a590..c0f0c30a2148 100644
+--- a/gtk/gtkmodules.c
++++ b/gtk/gtkmodules.c
+@@ -229,13 +229,8 @@ find_module (const gchar *name)
+   gchar *module_name;
+ 
+   module_name = _gtk_find_module (name, "modules");
+-  if (!module_name)
+-    {
+-      /* As last resort, try loading without an absolute path (using system
+-       * library path)
+-       */
+-      module_name = g_module_build_path (NULL, name);
+-    }
++  if (module_name == NULL)
++    return NULL;
+ 
+   module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
+ 

gtk2/PKGBUILD

@@ -1,9 +1,10 @@
+# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk2
 pkgver=2.24.33
-pkgrel=4
+pkgrel=5
 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
 url="https://www.gtk.org/"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
@@ -38,30 +39,25 @@ makedepends=(
   gobject-introspection
   gtk-doc
 )
-optdepends=(
-  'adwaita-icon-theme: Default icon theme'
-  'gnome-themes-standard: Default widget theme'
-  'python: gtk-builder-convert'
-)
-provides=(
-  libgailutil.so
-  libg{d,t}k-x11-2.0.so
-)
-install=gtk2.install
 source=(
   "git+https://gitlab.gnome.org/GNOME/gtk.git#tag=$pkgver"
-  gtkrc
   gtk-query-immodules-2.0.hook
   0001-Lower-severity-of-XID-collision-warnings.patch
+  0002-Stop-looking-for-modules-in-cwd.patch
 )
 b2sums=('1b18d1cfef55466209cf93be45af15dc058a8b74d13ab590cfc7f0b09b0584adc62d4330aaed65185c0142cc8c326e4274c8e75e0af94bec5be3cfcca105c1e6'
-        '0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc'
         '9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096'
-        '45ecc976d9eb9d990fc204230aa052a6d1b2bdfdc94788be37d576ab262a1da49855eb46ecd4bfce4efde6e2f817a1660c6d1fa756be3b372f7f8d13b0ef0fd0')
+        '45ecc976d9eb9d990fc204230aa052a6d1b2bdfdc94788be37d576ab262a1da49855eb46ecd4bfce4efde6e2f817a1660c6d1fa756be3b372f7f8d13b0ef0fd0'
+        '06ca1c6f0e8f6a7c7a3cc08ce3d358af978d28fc4aa8d9e981883e3ad5adf7d821bcb27bc8b93bf65171a92396ac8f7ad62c90db501a492cca7c30b6081e957f')
 
 prepare() {
   cd gtk
   git apply -3 ../0001-Lower-severity-of-XID-collision-warnings.patch
+
+  # CVE-2024-6655: https://www.openwall.com/lists/oss-security/2024/09/09/1
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7361
+  git apply -3 ../0002-Stop-looking-for-modules-in-cwd.patch
+
   sed -i '/AM_INIT_AUTOMAKE/s/]/ foreign]/' configure.ac
   autoreconf -fvi
 }
@@ -84,11 +80,27 @@ build() {
 }
 
 package() {
-  cd gtk
+  optdepends=(
-  make DESTDIR="$pkgdir" install
+    'adwaita-icon-theme: Default icon theme'
+    'gnome-themes-standard: Default widget theme'
+    'python: gtk-builder-convert'
+  )
+  provides=(
+    libgailutil.so
+    libgdk-x11-2.0.so
+    libgtk-x11-2.0.so
+  )
+  install=gtk2.install
 
-  install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc
+  make -C gtk DESTDIR="$pkgdir" install
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-2.0/gtkrc" <<END
+gtk-icon-theme-name = "Adwaita"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
+END
+
+  install -Dm644 gtk-query-immodules-2.0.hook -t "$pkgdir/usr/share/libalpm/hooks"
 
   # Built by GTK 4, shared with GTK 2/3
   rm "$pkgdir/usr/bin/gtk-update-icon-cache"