diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2010-02-15 00:09:12 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2010-02-15 00:09:12 +0000 |
| commit | 7f4b49b54ede3f474e6e3a84c7bd77c2ee83479f (patch) | |
| tree | cac0e41b92cbb43c638d9f903de173fc056d584e /media-gfx/gimp | |
| parent | Version bump. Important bug fixes and translation updates, bug #302325. (diff) | |
| download | gentoo-2-7f4b49b54ede3f474e6e3a84c7bd77c2ee83479f.tar.gz gentoo-2-7f4b49b54ede3f474e6e3a84c7bd77c2ee83479f.tar.bz2 gentoo-2-7f4b49b54ede3f474e6e3a84c7bd77c2ee83479f.zip | |
gimp fix for libpng 1.4
(Portage version: 2.1.7.17/cvs/Linux 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.8-libpng-1.4.patch | 39 | ||||
| -rw-r--r-- | media-gfx/gimp/gimp-2.6.8.ebuild | 6 |
3 files changed, 49 insertions, 2 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 06bf9a7453e9..0df504b935c2 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gimp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.308 2010/02/14 23:56:57 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.309 2010/02/15 00:09:05 hanno Exp $ + + 15 Feb 2010; Hanno Boeck <hanno@gentoo.org> gimp-2.6.8.ebuild, + +files/gimp-2.6.8-libpng-1.4.patch: + Upstream patch for compilation with libpng 1.4. 14 Feb 2010; Hanno Boeck <hanno@gentoo.org> -gimp-2.3.19.ebuild, -gimp-2.4.6.ebuild, -gimp-2.4.7.ebuild, -files/gimp-2.6.3-asneeded.diff, diff --git a/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch b/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch new file mode 100644 index 000000000000..01ab5860f7a3 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch @@ -0,0 +1,39 @@ +From b22eb0a8271a99257fe214cbf0adda29cf9a39dd Mon Sep 17 00:00:00 2001 +From: Michael Natterer <mitch@gimp.org> +Date: Sun, 31 Jan 2010 11:28:02 +0000 +Subject: Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0 + +Use png_set_expand_gray_1_2_4_to_8() instead of the deprecated +png_set_gray_1_2_4_to_8() if libpng is at least 1.2.27 (which is in +debian stable), so plug-ins built against old versions contine to work +when libpng 1.4 gets installed. +--- +diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c +index 79512ae..4d894be 100644 +--- a/plug-ins/file-ico/ico-load.c ++++ b/plug-ins/file-ico/ico-load.c +@@ -287,14 +287,22 @@ ico_read_png (FILE *fp, + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: ++#if PNG_LIBPNG_VER < 10227 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); + png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: ++#if PNG_LIBPNG_VER < 10227 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); +-- +cgit v0.8.3.1 diff --git a/media-gfx/gimp/gimp-2.6.8.ebuild b/media-gfx/gimp/gimp-2.6.8.ebuild index 8914cd74ad43..54cc5ae3f4fd 100644 --- a/media-gfx/gimp/gimp-2.6.8.ebuild +++ b/media-gfx/gimp/gimp-2.6.8.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/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.9 2010/02/10 13:54:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.10 2010/02/15 00:09:05 hanno Exp $ EAPI=2 @@ -53,6 +53,10 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog* HACKING NEWS README*" +src_prepare() { + epatch "${FILESDIR}/${P}-libpng-1.4.patch" +} + pkg_setup() { G2CONF="--enable-default-binary \ --with-x \ |