diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-12-12 10:24:59 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-12-12 10:24:59 +0000 |
| commit | 295be4d854e411a0ea23a624a3c1f697c71486e9 (patch) | |
| tree | 1175dcf4d22c36608bb8dec36b172a04eba0cb86 /gnome-extra | |
| parent | Version bump wrt #348468 by Matthew Turnbull. (diff) | |
| download | gentoo-2-295be4d854e411a0ea23a624a3c1f697c71486e9.tar.gz gentoo-2-295be4d854e411a0ea23a624a3c1f697c71486e9.tar.bz2 gentoo-2-295be4d854e411a0ea23a624a3c1f697c71486e9.zip | |
Fix compilation with >=gtk+ 2.22. Thanks to Ivan Mak in bug 346123.
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/gnome-do/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch | 17 | ||||
| -rw-r--r-- | gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild | 3 |
3 files changed, 24 insertions, 2 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/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() { |