diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-11-27 08:52:23 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-11-27 08:52:23 +0000 |
| commit | 8e2e230a060ae18fee753c0023836255d05bf80c (patch) | |
| tree | 3e136d2caaaf90f0869477f185869c133f26044e /media-gfx | |
| parent | remove old version of qlandkarte (diff) | |
| download | gentoo-2-8e2e230a060ae18fee753c0023836255d05bf80c.tar.gz gentoo-2-8e2e230a060ae18fee753c0023836255d05bf80c.tar.bz2 gentoo-2-8e2e230a060ae18fee753c0023836255d05bf80c.zip | |
gimp: fix building with forced --as-needed
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/gimp/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.6.3-asneeded.diff | 10 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.6.3.ebuild | 13 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index fdc67d7dca47..145def664eb8 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gimp # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.273 2008/11/22 19:34:17 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.274 2008/11/27 08:52:23 hanno Exp $ + + 27 Nov 2008; Hanno Boeck <hanno@gentoo.org> + +files/gimp-2.6.3-asneeded.diff, gimp-2.6.3.ebuild: + Fix compilation with forced --as-needed. *gimp-2.6.3 (22 Nov 2008) diff --git a/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff b/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff new file mode 100644 index 000000000000..f46aa35f4ab4 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.6.3-asneeded.diff @@ -0,0 +1,10 @@ +--- gimp-2.6.3/app/Makefile.am 2008-11-20 23:43:08.000000000 +0100 ++++ gimp-2.6.3-1/app/Makefile.am 2008-11-26 17:37:56.000000000 +0100 +@@ -141,6 +141,7 @@ + $(GEGL_LIBS) \ + $(RT_LIBS) \ + $(INTLLIBS) \ ++ $(GLIB_LIBS) \ + $(GIMPICONRC) + + diff --git a/media-gfx/gimp/gimp-2.6.3.ebuild b/media-gfx/gimp/gimp-2.6.3.ebuild index 128698146c12..03d69688da50 100644 --- a/media-gfx/gimp/gimp-2.6.3.ebuild +++ b/media-gfx/gimp/gimp-2.6.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.3.ebuild,v 1.1 2008/11/22 19:34:17 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.3.ebuild,v 1.2 2008/11/27 08:52:23 hanno Exp $ -inherit eutils gnome2 fdo-mime multilib python +inherit autotools eutils gnome2 fdo-mime multilib python DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="http://www.gimp.org/" @@ -54,6 +54,15 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog* HACKING NEWS README*" +src_unpack() { + gnome2_src_unpack + + cd "${S}" + epatch "${FILESDIR}/${P}-asneeded.diff" || die + + eautoreconf || die +} + pkg_setup() { if use pdf && ! built_with_use app-text/poppler-bindings gtk; then eerror "This package requires app-text/poppler-bindings compiled with GTK+ support." |