[arch-commits] Commit in gtk2/trunk (PKGBUILD xid-collision-debug.patch)

[Jan Steffens]

    Date: Monday, December 21, 2020 @ 02:01:47
  Author: heftig
Revision: 404711

2.24.33-1

Modified:
  gtk2/trunk/PKGBUILD
  gtk2/trunk/xid-collision-debug.patch

---------------------------+
 PKGBUILD                  |   12 ++++++------
 xid-collision-debug.patch |   11 ++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-21 01:14:22 UTC (rev 404710)
+++ PKGBUILD	2020-12-21 02:01:47 UTC (rev 404711)
@@ -1,8 +1,9 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.24.32
-pkgrel=2
+pkgver=2.24.33
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
 arch=(x86_64)
 url="https://www.gtk.org/"
@@ -15,7 +16,7 @@
 provides=(libgailutil.so libg{d,t}k-x11-2.0.so)
 license=(LGPL)
 install=gtk2.install
-_commit=ed7d3e25f8b6debae6ccc8b50d1329155338cab8  # tags/2.24.32^0
+_commit=68631945733158f164427db84f01301d7e875763  # tags/2.24.33^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtkrc
         gtk-query-immodules-2.0.hook
@@ -23,7 +24,7 @@
 sha256sums=('SKIP'
             'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
             '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc')
 
 pkgver() {
   cd gtk
@@ -32,8 +33,7 @@
 
 prepare() {
   cd gtk
-  git cherry-pick -n 2dbf31c0ea4f17a817b931c731f8de14c278300d
-  patch -Np1 -i ../xid-collision-debug.patch
+  git apply -3 ../xid-collision-debug.patch
   sed -i '1s/python$/&2/' gtk/gtk-builder-convert
   NOCONFIGURE=1 ./autogen.sh
 }

Modified: xid-collision-debug.patch
===================================================================
--- xid-collision-debug.patch	2020-12-21 01:14:22 UTC (rev 404710)
+++ xid-collision-debug.patch	2020-12-21 02:01:47 UTC (rev 404711)
@@ -1,6 +1,11 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
+ gdk/x11/gdkxid.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git c/gdk/x11/gdkxid.c i/gdk/x11/gdkxid.c
+index 1005f9e40c..71578f8fcf 100644
+--- c/gdk/x11/gdkxid.c
++++ i/gdk/x11/gdkxid.c
+@@ -56,10 +56,10 @@ _gdk_xid_table_insert (GdkDisplay *display,
    if (!display_x11->xid_ht)
      display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
  					    (GEqualFunc) gdk_xid_equal);