diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-07-21 16:30:05 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-07-21 16:30:05 +0000 |
| commit | 97cc6d745d1c5dff331093ab88af31333db2fc5d (patch) | |
| tree | ffa232adca95a77587a36bc617604290fe8da08f /gpe-base | |
| parent | amd64/ppc/ppc64 stable wrt #416725 (diff) | |
| download | gentoo-2-97cc6d745d1c5dff331093ab88af31333db2fc5d.tar.gz gentoo-2-97cc6d745d1c5dff331093ab88af31333db2fc5d.tar.bz2 gentoo-2-97cc6d745d1c5dff331093ab88af31333db2fc5d.zip | |
Let it compile against glib-2.32
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'gpe-base')
| -rw-r--r-- | gpe-base/libgpewidget/ChangeLog | 8 | ||||
| -rw-r--r-- | gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch | 12 | ||||
| -rw-r--r-- | gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/gpe-base/libgpewidget/ChangeLog b/gpe-base/libgpewidget/ChangeLog index 21930d67453d..0baceda2b122 100644 --- a/gpe-base/libgpewidget/ChangeLog +++ b/gpe-base/libgpewidget/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gpe-base/libgpewidget # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/ChangeLog,v 1.11 2012/05/23 13:11:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/ChangeLog,v 1.12 2012/07/21 16:30:05 pacho Exp $ + + 21 Jul 2012; Pacho Ramos <pacho@gentoo.org> + +files/libgpewidget-0.117-glib-single-include.patch, + libgpewidget-0.117-r1.ebuild: + Let it compile against glib-2.32 23 May 2012; Kacper Kowalik <xarthisius@gentoo.org> libgpewidget-0.117-r1.ebuild: @@ -46,4 +51,3 @@ 28 Feb 2009; <solar@gentoo.org> +metadata.xml, +libgpewidget-0.117.ebuild: Initial commit based on code from Rene Wagner - diff --git a/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch b/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch new file mode 100644 index 000000000000..cfac0b9b217c --- /dev/null +++ b/gpe-base/libgpewidget/files/libgpewidget-0.117-glib-single-include.patch @@ -0,0 +1,12 @@ +Index: libgpewidget-0.117/gpehelp.c +=================================================================== +--- libgpewidget-0.117.orig/gpehelp.c ++++ libgpewidget-0.117/gpehelp.c +@@ -33,7 +33,6 @@ + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <gdk/gdk.h> + #include <glib.h> +-#include <glib/gkeyfile.h> + + + /* helper function definitions*/ diff --git a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild index 01348c734547..5869a09947ff 100644 --- a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild +++ b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.9 2012/05/23 13:11:44 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.10 2012/07/21 16:30:05 pacho Exp $ -EAPI=2 +EAPI=4 GPE_TARBALL_SUFFIX="bz2" inherit gpe autotools eutils @@ -38,6 +38,8 @@ src_prepare() { # Fix LINGUAS bug #406419 epatch "${FILESDIR}/${P}-linguas.patch" + epatch "${FILESDIR}/${P}-glib-single-include.patch" + # Fix underlinking, bug #367421 sed -i -e 's/^infoprint_LDADD =/infoprint_LDADD = -lX11/' Makefile.am \ || die 'Failed to sed Makefile.am' |