diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-10-09 21:27:06 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-10-09 21:27:06 +0000 |
| commit | c4ada75719f5fb2a1ddf46759fef702679f8b8fb (patch) | |
| tree | 60c4a59d06a24098667054c3037b0d7347b9fe39 /media-gfx/gimp | |
| parent | Add cyrus-sasl to dependencies (fixes bug #240618). (diff) | |
| download | gentoo-2-c4ada75719f5fb2a1ddf46759fef702679f8b8fb.tar.gz gentoo-2-c4ada75719f5fb2a1ddf46759fef702679f8b8fb.tar.bz2 gentoo-2-c4ada75719f5fb2a1ddf46759fef702679f8b8fb.zip | |
gimp: fix build with USE=-jpeg
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc9-00169-gb34c873 x86_64)
Diffstat (limited to 'media-gfx/gimp')
| -rw-r--r-- | media-gfx/gimp/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch | 40 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.6.0.ebuild | 3 |
3 files changed, 47 insertions, 2 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 236c973c3ba6..c04305321208 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.266 2008/10/08 20:37:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.267 2008/10/09 21:27:04 hanno Exp $ + + 09 Oct 2008; Hanno Boeck <hanno@gentoo.org> + +files/gimp-2.6.0-file-psd-needs-jpeg.patch, gimp-2.6.0.ebuild: + Fix build with USE=-jpeg. 08 Oct 2008; Raúl Porcel <armin76@gentoo.org> gimp-2.4.6.ebuild: alpha/ia64 stable wrt #239223 diff --git a/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch b/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch new file mode 100644 index 000000000000..e8cdaa3554d3 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.6.0-file-psd-needs-jpeg.patch @@ -0,0 +1,40 @@ +diff -Naur gimp-2.6.0-old/plug-ins/Makefile.am gimp-2.6.0/plug-ins/Makefile.am +--- gimp-2.6.0-old/plug-ins/Makefile.am 2008-08-21 13:35:22.000000000 +0200 ++++ gimp-2.6.0/plug-ins/Makefile.am 2008-10-09 17:03:04.000000000 +0200 +@@ -10,6 +10,7 @@ + + if BUILD_JPEG + file_jpeg = file-jpeg ++file_psd = file-psd + endif + + if BUILD_PRINT +@@ -57,7 +58,7 @@ + file-fli \ + $(file_ico) \ + $(file_jpeg) \ +- file-psd \ ++ $(file_psd) \ + file-sgi \ + $(file_uri) \ + $(file_xjt) \ +diff -Naur gimp-2.6.0-old/plug-ins/Makefile.in gimp-2.6.0/plug-ins/Makefile.in +--- gimp-2.6.0-old/plug-ins/Makefile.in 2008-09-29 19:23:20.000000000 +0200 ++++ gimp-2.6.0/plug-ins/Makefile.in 2008-10-09 17:05:56.000000000 +0200 +@@ -385,6 +385,7 @@ + + @BUILD_HELP_BROWSER_TRUE@help_browser = help-browser + @BUILD_JPEG_TRUE@file_jpeg = file-jpeg ++@BUILD_JPEG_TRUE@file_psd = file-psd + @BUILD_PRINT_TRUE@print = print + @BUILD_PYTHON_TRUE@pygimp = pygimp + @BUILD_SCRIPT_FU_TRUE@script_fu = script-fu +@@ -405,7 +406,7 @@ + file-fli \ + $(file_ico) \ + $(file_jpeg) \ +- file-psd \ ++ $(file_psd) \ + file-sgi \ + $(file_uri) \ + $(file_xjt) \ diff --git a/media-gfx/gimp/gimp-2.6.0.ebuild b/media-gfx/gimp/gimp-2.6.0.ebuild index b95d2ec60ab5..c6090af47bc9 100644 --- a/media-gfx/gimp/gimp-2.6.0.ebuild +++ b/media-gfx/gimp/gimp-2.6.0.ebuild @@ -1,6 +1,6 @@ # 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.0.ebuild,v 1.2 2008/10/08 09:17:26 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.0.ebuild,v 1.3 2008/10/09 21:27:04 hanno Exp $ inherit gnome2 fdo-mime flag-o-matic multilib python eutils @@ -58,6 +58,7 @@ src_unpack() { gnome2_src_unpack cd "${S}" epatch "${FILESDIR}/gimp-2.6-file-uri.patch" || die "epatch failed" + epatch "${FILESDIR}/${P}-file-psd-needs-jpeg.patch" || die "epatch failed" } pkg_setup() { |