Fix compilation with >=gtk+ 2.22. Thanks to Ivan Mak in bug 346123.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 30 insertions, 7 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index fd61790f5a57..184c3d69d79f 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-do
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.23 2010/10/24 07:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.24 2010/12/12 10:24:59 graaff Exp $
+
+  12 Dec 2010; Hans de Graaff <graaff@gentoo.org> gnome-do-0.8.3.1.ebuild,
+  +files/gnome-do-0.8.3.1-gtk-2.22.patch:
+  Fix compilation with >=gtk+ 2.22. Thanks to Ivan Mak in bug 346123.
 
   24 Oct 2010; Hans de Graaff <graaff@gentoo.org> gnome-do-0.8.3.1.ebuild,
   +files/gnome-do-0.8.3.1-mono-2.8.patch:
diff --git a/gnome-extra/gnome-do/Manifest b/gnome-extra/gnome-do/Manifest
index 38757e6a6788..ff7b89ad81b4 100644
--- a/gnome-extra/gnome-do/Manifest
+++ b/gnome-extra/gnome-do/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-do-0.8.3.1-gtk-2.22.patch 495 RMD160 19851034d5ce970c8ddd7c72860bf0c80611d86a SHA1 69a07dac564a14c12449c995ea6f78ed2053b613 SHA256 c5270f5c2ceec3cb06a96eb033e6a2dec1c8dbf8a9d545737f9c8c59d277a787
 AUX gnome-do-0.8.3.1-mono-2.8.patch 3390 RMD160 e4d95f0daac0ef9d4a480f8ec88f23780c4cada1 SHA1 cf9812c64e58d6ce112cb4cabc0529ae0c51fff7 SHA256 3bf46487d2f87daff17f1150a2e988689af270d3998465ee1652132a1ab60e29
 DIST gnome-do-0.8.3.1.tar.gz 1264294 RMD160 7b894129759383bf6e82f3ed8ab61f0e72aa7d98 SHA1 d4c19dded07e4f728c849c03e2284ddda325fabc SHA256 aa263b02193f8a403d906005e135c7315e6b02bf3a170ab3ff8409ed5acbe467
-EBUILD gnome-do-0.8.3.1.ebuild 1466 RMD160 f0e29cf816ad687989c0eca52786c90bea248266 SHA1 b7b27e2fa1d201a91f3323690b176759932a685e SHA256 e7280b7886c700cff4543907542890d63cdf0909165f9c4d4c5953aeabde9ea1
-MISC ChangeLog 4488 RMD160 559d5e59333c75592e8dadcdc423a4bf17d93965 SHA1 4b4998cb12712d2c648ae6b5717e977fd9858da1 SHA256 a4861fe5d86c2fd7950c7b4a55a321897ff42e576124d91511a429d7543981d3
+EBUILD gnome-do-0.8.3.1.ebuild 1508 RMD160 b5cb14857a34e7c5f0162fae8a050ddb38c459a0 SHA1 795b103af5d74c4fd77c22f9108da372a0e27fc9 SHA256 a5db122cc0620f92330043fa6465c31dec692d756e85ed3a64d514496aa8b4a1
+MISC ChangeLog 4676 RMD160 76e338db0a3e7df11a368f57fca575928240d1fa SHA1 1d5679f84a9116d10b293f1f65874c096e4b5c9f SHA256 16f1528abbf65fa0d510b1048a35f7f617a20ffb3618f1597373d4b2e329d781
 MISC metadata.xml 659 RMD160 9f0be777455f361ebf48aaf4a7f2c9eda7d1e38f SHA1 f2a4936ced71c9dc7187c06df2145dec10a43ad0 SHA256 d30200e9c3f2404ab3a9ae9850854eea4dd5bc9391e4b5aa0b728e047865aec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzD5uIACgkQZihJkut28SvxXAD/RJ6gu/ucn9un+tHKkFCXGO56
-ibV4tTbJxFp2pV2eY28BAIasBX/6G9zP4j70I5oFdmQkFNbRyWUYHpMyy4jV0aKN
-=8lNl
+iF4EAREIAAYFAk0EowsACgkQppaJjIURYXI0MQD+M4oR9jRk2UgENwOq4OUqOTac
+cttQXIZoqp2taRLiPA8A/0YC52nGmEVQT2adMA64VnOKSh5WDAvj0emavHNqP70D
+=47sG
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch
new file mode 100644
index 000000000000..02d973aa1e3a
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=346123
+
+Removes depracted use of gdk_display.
+
+=== modified file 'libdo/keybinder.c'
+--- libdo/keybinder.c	2009-07-23 07:17:00 +0000
++++ libdo/keybinder.c	2010-11-09 10:45:25 +0000
+@@ -319,7 +319,7 @@
+ 	XModifierKeymap *mod_keymap;
+ 	gboolean retval = FALSE;
+ 
+-	mod_keymap = XGetModifierMapping (gdk_display);
++        mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ 
+ 	map_size = 8 * mod_keymap->max_keypermod;
+ 
+
diff --git a/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild b/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
index e565879f1557..6242767481e1 100644
--- a/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
+++ b/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild,v 1.4 2010/10/24 07:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild,v 1.5 2010/12/12 10:24:59 graaff Exp $
 
 # TODO: GNOME Do defaults to a debug build; to disable, --enable-release must
 # be passed. However, when doing this the build fails; figure out why.
@@ -44,6 +44,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-mono-2.8.patch
+	epatch "${FILESDIR}"/${P}-gtk-2.22.patch
 }
 
 src_configure() {