diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-04-19 09:11:59 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-04-19 09:11:59 +0000 |
| commit | 279c2ad8ea06ffaa397b15fec251395d6d59484a (patch) | |
| tree | 0a9e0bf700977243c3b8dd252f97006079517fd1 /x11-terms/guake | |
| parent | Ensure new enough version of libcdr. (diff) | |
| download | gentoo-2-279c2ad8ea06ffaa397b15fec251395d6d59484a.tar.gz gentoo-2-279c2ad8ea06ffaa397b15fec251395d6d59484a.tar.bz2 gentoo-2-279c2ad8ea06ffaa397b15fec251395d6d59484a.zip | |
Fix glib-2.32 compilation, bug #412607 by Franz Fellner.
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms/guake')
| -rw-r--r-- | x11-terms/guake/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-terms/guake/files/guake-0.4.2-glib2.32.patch | 11 | ||||
| -rw-r--r-- | x11-terms/guake/guake-0.4.2-r1.ebuild | 17 |
3 files changed, 23 insertions, 11 deletions
diff --git a/x11-terms/guake/ChangeLog b/x11-terms/guake/ChangeLog index 54c7aba4f38a..cbd8e51ca0bf 100644 --- a/x11-terms/guake/ChangeLog +++ b/x11-terms/guake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/guake # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.14 2012/03/14 03:33:44 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.15 2012/04/19 09:11:59 pacho Exp $ + + 19 Apr 2012; Pacho Ramos <pacho@gentoo.org> +files/guake-0.4.2-glib2.32.patch, + guake-0.4.2-r1.ebuild: + Fix glib-2.32 compilation, bug #412607 by Franz Fellner. *guake-0.4.2-r1 (14 Mar 2012) diff --git a/x11-terms/guake/files/guake-0.4.2-glib2.32.patch b/x11-terms/guake/files/guake-0.4.2-glib2.32.patch new file mode 100644 index 000000000000..11a3c88f9324 --- /dev/null +++ b/x11-terms/guake/files/guake-0.4.2-glib2.32.patch @@ -0,0 +1,11 @@ +--- src/globalhotkeys/keybinder.h.org 2012-04-19 09:35:51.756585621 +0200 ++++ src/globalhotkeys/keybinder.h 2012-04-19 09:36:06.675585632 +0200 +@@ -2,7 +2,7 @@ + #ifndef __KEY_BINDER_H__ + #define __KEY_BINDER_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/x11-terms/guake/guake-0.4.2-r1.ebuild b/x11-terms/guake/guake-0.4.2-r1.ebuild index 129209d9d0f4..fe14eec41830 100644 --- a/x11-terms/guake/guake-0.4.2-r1.ebuild +++ b/x11-terms/guake/guake-0.4.2-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2-r1.ebuild,v 1.1 2012/03/14 03:31:00 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2-r1.ebuild,v 1.2 2012/04/19 09:11:59 pacho Exp $ -EAPI=3 - -GCONF_DEBUG=no +EAPI=4 +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" PYTHON_DEPEND="2:2.7" inherit eutils gnome2 python multilib @@ -36,23 +36,20 @@ pkg_setup() { --disable-dependency-tracking $(use_enable nls)" python_set_active_version 2 + python_pkg_setup } src_prepare() { epatch \ "${FILESDIR}"/${P}-int-ssl-port.patch \ - "${FILESDIR}"/${P}-prefs-spinbox.patch + "${FILESDIR}"/${P}-prefs-spinbox.patch \ + "${FILESDIR}"/${P}-glib2.32.patch sed -i -e s:/usr/bin/python:/usr/bin/python2: src/guake*.in || die gnome2_src_prepare } -src_install() { - gnome2_src_install - find "${D}" -name '*.la' -exec rm -f {} + -} - pkg_postinst() { gnome2_pkg_postinst python_mod_optimize /usr/$(get_libdir)/${PN} |