Date: Sunday, July 22, 2012 @ 05:08:14
Author: ibiru
Revision: 163911
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk2/repos/extra-i686/PKGBUILD
(from rev 163910, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-i686/fix-stuck-grabs.patch
(from rev 163910, gtk2/trunk/fix-stuck-grabs.patch)
gtk2/repos/extra-i686/gtk2.install
(from rev 163910, gtk2/trunk/gtk2.install)
gtk2/repos/extra-i686/xid-collision-debug.patch
(from rev 163910, gtk2/trunk/xid-collision-debug.patch)
gtk2/repos/extra-x86_64/PKGBUILD
(from rev 163910, gtk2/trunk/PKGBUILD)
gtk2/repos/extra-x86_64/fix-stuck-grabs.patch
(from rev 163910, gtk2/trunk/fix-stuck-grabs.patch)
gtk2/repos/extra-x86_64/gtk2.install
(from rev 163910, gtk2/trunk/gtk2.install)
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 163910, gtk2/trunk/xid-collision-debug.patch)
Deleted:
gtk2/repos/extra-i686/PKGBUILD
gtk2/repos/extra-i686/gtk2.install
gtk2/repos/extra-i686/xid-collision-debug.patch
gtk2/repos/extra-x86_64/PKGBUILD
gtk2/repos/extra-x86_64/gtk2.install
gtk2/repos/extra-x86_64/xid-collision-debug.patch
----------------------------------------+
extra-i686/PKGBUILD | 115 +++++++++++++++----------------
extra-i686/fix-stuck-grabs.patch | 47 ++++++++++++
extra-i686/gtk2.install | 32 ++++----
extra-i686/xid-collision-debug.patch | 30 ++++----
extra-x86_64/PKGBUILD | 115 +++++++++++++++----------------
extra-x86_64/fix-stuck-grabs.patch | 47 ++++++++++++
extra-x86_64/gtk2.install | 32 ++++----
extra-x86_64/xid-collision-debug.patch | 30 ++++----
8 files changed, 274 insertions(+), 174 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-22 09:06:58 UTC (rev 163910)
+++ extra-i686/PKGBUILD 2012-07-22 09:08:14 UTC (rev 163911)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.11
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/";
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2'
'gobject-introspection')
-options=('!libtool')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- xid-collision-debug.patch)
-sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
- cd "$srcdir/gtk+-$pkgver"
- patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xinput=yes
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk2() {
- pkgdesc="GTK+ is a multi-platform toolkit (v2)"
- install=gtk2.install
- depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups'
'gtk-update-icon-cache')
- backup=(etc/gtk-2.0/gtkrc)
- replaces=('gtk2-docs')
-
- cd "$srcdir/gtk+-$pkgver"
-
- make DESTDIR="$pkgdir" install
- sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
- echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
- #split this out to use with gtk3 too
- rm $pkgdir/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
- pkgdesc="The GTK+ update icon cache tool"
- depends=('gdk-pixbuf2>=2.24.1-3')
-
- cd "$srcdir/gtk+-$pkgver/gtk"
-
- install -D -m755 gtk-update-icon-cache
$pkgdir/usr/bin/gtk-update-icon-cache
-}
Copied: gtk2/repos/extra-i686/PKGBUILD (from rev 163910, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.11
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/";
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage'
+ 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2'
'gobject-introspection')
+options=('!libtool')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ xid-collision-debug.patch
+ fix-stuck-grabs.patch)
+sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '7739a1ab04aaf6e7f87987bad106062456e71933bc50acd948160cc03634dcd9')
+
+build() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../xid-collision-debug.patch
+ patch -Np1 -i ../fix-stuck-grabs.patch
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-xinput=yes
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk2() {
+ pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+ install=gtk2.install
+ depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups'
'gtk-update-icon-cache')
+ backup=(etc/gtk-2.0/gtkrc)
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+ echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
+ #split this out to use with gtk3 too
+ rm $pkgdir/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+ pkgdesc="The GTK+ update icon cache tool"
+ depends=('gdk-pixbuf2>=2.24.1-3')
+
+ cd gtk+-$pkgver/gtk
+
+ install -D -m755 gtk-update-icon-cache
$pkgdir/usr/bin/gtk-update-icon-cache
+}
Copied: gtk2/repos/extra-i686/fix-stuck-grabs.patch (from rev 163910,
gtk2/trunk/fix-stuck-grabs.patch)
===================================================================
--- extra-i686/fix-stuck-grabs.patch (rev 0)
+++ extra-i686/fix-stuck-grabs.patch 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,47 @@
+From a9fb816a3f64227936f4b25882e4f20ab5018c9c Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@redhat.com>
+Date: Wed, 16 May 2012 21:18:51 +0000
+Subject: Fix a case of 'stuck grab'
+
+This was showing up when using a combo box in list mode. After popping
+up the list, the keyboard grab appeared stuck. What was stuck here is
+only the client-side grab, since we forgot to clean up our grabs
+when receiving an UnmapNotify.
+
+This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
+
+[ Alexandre Rostovtsev <tetrom...@gentoo.org>: backport to 2.24 ]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680346
+---
+diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
+index 7cc1000..b96e9f5 100644
+--- a/gdk/x11/gdkevents-x11.c
++++ b/gdk/x11/gdkevents-x11.c
+@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
+ * means we hid the window ourselves, so we will have already
flipped
+ * the iconified bit off.
+ */
+- if (window)
+- {
+- if (GDK_WINDOW_IS_MAPPED (window))
+- gdk_synthesize_window_state (window,
+- 0,
+- GDK_WINDOW_STATE_ICONIFIED);
+-
+- _gdk_xgrab_check_unmap (window, xevent->xany.serial);
+- }
++ if (window && GDK_WINDOW_IS_MAPPED (window))
++ gdk_synthesize_window_state (window,
++ 0,
++ GDK_WINDOW_STATE_ICONIFIED);
+ }
++
++ if (window)
++ _gdk_xgrab_check_unmap (window, xevent->xany.serial);
++
+ break;
+
+ case MapNotify:
+--
+cgit v0.9.0.2
Deleted: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install 2012-07-22 09:06:58 UTC (rev 163910)
+++ extra-i686/gtk2.install 2012-07-22 09:08:14 UTC (rev 163911)
@@ -1,16 +0,0 @@
-post_install() {
- gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
- rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
Copied: gtk2/repos/extra-i686/gtk2.install (from rev 163910,
gtk2/trunk/gtk2.install)
===================================================================
--- extra-i686/gtk2.install (rev 0)
+++ extra-i686/gtk2.install 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,16 @@
+post_install() {
+ gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+ pre_remove
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
+ rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}
Deleted: extra-i686/xid-collision-debug.patch
===================================================================
--- extra-i686/xid-collision-debug.patch 2012-07-22 09:06:58 UTC (rev
163910)
+++ extra-i686/xid-collision-debug.patch 2012-07-22 09:08:14 UTC (rev
163911)
@@ -1,15 +0,0 @@
---- 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 @@
- if (!display_x11->xid_ht)
- display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- (GEqualFunc) gdk_xid_equal);
--
-+/*
- if (g_hash_table_lookup (display_x11->xid_ht, xid))
- g_warning ("XID collision, trouble ahead");
--
-+*/
- g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
-
Copied: gtk2/repos/extra-i686/xid-collision-debug.patch (from rev 163910,
gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-i686/xid-collision-debug.patch (rev 0)
+++ extra-i686/xid-collision-debug.patch 2012-07-22 09:08:14 UTC (rev
163911)
@@ -0,0 +1,15 @@
+--- 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 @@
+ if (!display_x11->xid_ht)
+ display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11->xid_ht, xid))
+ g_warning ("XID collision, trouble ahead");
+-
++*/
+ g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-22 09:06:58 UTC (rev 163910)
+++ extra-x86_64/PKGBUILD 2012-07-22 09:08:14 UTC (rev 163911)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.11
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/";
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2'
'gobject-introspection')
-options=('!libtool')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- xid-collision-debug.patch)
-sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
- cd "$srcdir/gtk+-$pkgver"
- patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xinput=yes
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk2() {
- pkgdesc="GTK+ is a multi-platform toolkit (v2)"
- install=gtk2.install
- depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups'
'gtk-update-icon-cache')
- backup=(etc/gtk-2.0/gtkrc)
- replaces=('gtk2-docs')
-
- cd "$srcdir/gtk+-$pkgver"
-
- make DESTDIR="$pkgdir" install
- sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
- echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
- #split this out to use with gtk3 too
- rm $pkgdir/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
- pkgdesc="The GTK+ update icon cache tool"
- depends=('gdk-pixbuf2>=2.24.1-3')
-
- cd "$srcdir/gtk+-$pkgver/gtk"
-
- install -D -m755 gtk-update-icon-cache
$pkgdir/usr/bin/gtk-update-icon-cache
-}
Copied: gtk2/repos/extra-x86_64/PKGBUILD (from rev 163910, gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.11
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/";
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage'
+ 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2'
'gobject-introspection')
+options=('!libtool')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+ xid-collision-debug.patch
+ fix-stuck-grabs.patch)
+sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '7739a1ab04aaf6e7f87987bad106062456e71933bc50acd948160cc03634dcd9')
+
+build() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../xid-collision-debug.patch
+ patch -Np1 -i ../fix-stuck-grabs.patch
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-xinput=yes
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk2() {
+ pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+ install=gtk2.install
+ depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi'
'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups'
'gtk-update-icon-cache')
+ backup=(etc/gtk-2.0/gtkrc)
+ replaces=('gtk2-docs')
+
+ cd gtk+-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+ echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
+ #split this out to use with gtk3 too
+ rm $pkgdir/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+ pkgdesc="The GTK+ update icon cache tool"
+ depends=('gdk-pixbuf2>=2.24.1-3')
+
+ cd gtk+-$pkgver/gtk
+
+ install -D -m755 gtk-update-icon-cache
$pkgdir/usr/bin/gtk-update-icon-cache
+}
Copied: gtk2/repos/extra-x86_64/fix-stuck-grabs.patch (from rev 163910,
gtk2/trunk/fix-stuck-grabs.patch)
===================================================================
--- extra-x86_64/fix-stuck-grabs.patch (rev 0)
+++ extra-x86_64/fix-stuck-grabs.patch 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,47 @@
+From a9fb816a3f64227936f4b25882e4f20ab5018c9c Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@redhat.com>
+Date: Wed, 16 May 2012 21:18:51 +0000
+Subject: Fix a case of 'stuck grab'
+
+This was showing up when using a combo box in list mode. After popping
+up the list, the keyboard grab appeared stuck. What was stuck here is
+only the client-side grab, since we forgot to clean up our grabs
+when receiving an UnmapNotify.
+
+This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
+
+[ Alexandre Rostovtsev <tetrom...@gentoo.org>: backport to 2.24 ]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680346
+---
+diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
+index 7cc1000..b96e9f5 100644
+--- a/gdk/x11/gdkevents-x11.c
++++ b/gdk/x11/gdkevents-x11.c
+@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
+ * means we hid the window ourselves, so we will have already
flipped
+ * the iconified bit off.
+ */
+- if (window)
+- {
+- if (GDK_WINDOW_IS_MAPPED (window))
+- gdk_synthesize_window_state (window,
+- 0,
+- GDK_WINDOW_STATE_ICONIFIED);
+-
+- _gdk_xgrab_check_unmap (window, xevent->xany.serial);
+- }
++ if (window && GDK_WINDOW_IS_MAPPED (window))
++ gdk_synthesize_window_state (window,
++ 0,
++ GDK_WINDOW_STATE_ICONIFIED);
+ }
++
++ if (window)
++ _gdk_xgrab_check_unmap (window, xevent->xany.serial);
++
+ break;
+
+ case MapNotify:
+--
+cgit v0.9.0.2
Deleted: extra-x86_64/gtk2.install
===================================================================
--- extra-x86_64/gtk2.install 2012-07-22 09:06:58 UTC (rev 163910)
+++ extra-x86_64/gtk2.install 2012-07-22 09:08:14 UTC (rev 163911)
@@ -1,16 +0,0 @@
-post_install() {
- gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
- rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
Copied: gtk2/repos/extra-x86_64/gtk2.install (from rev 163910,
gtk2/trunk/gtk2.install)
===================================================================
--- extra-x86_64/gtk2.install (rev 0)
+++ extra-x86_64/gtk2.install 2012-07-22 09:08:14 UTC (rev 163911)
@@ -0,0 +1,16 @@
+post_install() {
+ gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+ pre_remove
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
+ rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}
Deleted: extra-x86_64/xid-collision-debug.patch
===================================================================
--- extra-x86_64/xid-collision-debug.patch 2012-07-22 09:06:58 UTC (rev
163910)
+++ extra-x86_64/xid-collision-debug.patch 2012-07-22 09:08:14 UTC (rev
163911)
@@ -1,15 +0,0 @@
---- 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 @@
- if (!display_x11->xid_ht)
- display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- (GEqualFunc) gdk_xid_equal);
--
-+/*
- if (g_hash_table_lookup (display_x11->xid_ht, xid))
- g_warning ("XID collision, trouble ahead");
--
-+*/
- g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
-
Copied: gtk2/repos/extra-x86_64/xid-collision-debug.patch (from rev 163910,
gtk2/trunk/xid-collision-debug.patch)
===================================================================
--- extra-x86_64/xid-collision-debug.patch (rev 0)
+++ extra-x86_64/xid-collision-debug.patch 2012-07-22 09:08:14 UTC (rev
163911)
@@ -0,0 +1,15 @@
+--- 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 @@
+ if (!display_x11->xid_ht)
+ display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11->xid_ht, xid))
+ g_warning ("XID collision, trouble ahead");
+-
++*/
+ g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+
