gimp fix for libpng 1.4

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 55 insertions, 7 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/Manifest b/media-gfx/gimp/Manifest
index 8b51b1a974ff..5ecc3d6023e5 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gimp-2.6.8-libpng-1.4.patch 1346 RMD160 8e6272af4bb869daeb348600e296412a7a11149d SHA1 0f9271676429a6a868ca2d104328f12d3eacb863 SHA256 521bd1f7d0afb9d8e86d99cbcdbcabeb9a1ecfff6e91ab002012f01f501d2ee3
 DIST gimp-2.6.8.tar.bz2 16342377 RMD160 da02fedcc00ebaac04bfd21c153a7130d3ff5e08 SHA1 a550943f086abc9bf6b96d576741337b7186a4f4 SHA256 d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
-EBUILD gimp-2.6.8.ebuild 2514 RMD160 88b152cebeca93279bbc650eb7dafb5543045167 SHA1 5c84a4fb42e3ced251138b738fb7954901e6d90c SHA256 00e86255581b32540be6613191943b57ef3a74fbd6a4959b3b22378df0c8c665
+EBUILD gimp-2.6.8.ebuild 2574 RMD160 5030e015e78ee92dc32f00bde22010f887ec9fe3 SHA1 d0f671d685e28c42b1c7e594226de8110278ba27 SHA256 871c1e668a927bb829794fb00bfa2d97d33ce73cb361c3a4d28dcc8a1272611b
 EBUILD gimp-9999.ebuild 2624 RMD160 c456309be34433faa5f5b1546a35f1f0c48947d3 SHA1 c6bfdc0aaea2dfd3022420e2bb6916888942edd4 SHA256 3055570b7c0ee593174165dc6d115ad4e2accb3c8323396e04697e50d27d1695
-MISC ChangeLog 41699 RMD160 d39355d0d3c88b953f3fbe5663a6b6732a4cafd1 SHA1 e1f5ef961fedcdd234ddc8069c467688e10ad258 SHA256 8c05d6e906962b21dcd4a5757891e1a9127bf6ea1b0cf04d6562bcd964f2c0c8
+MISC ChangeLog 41853 RMD160 8e30d6f6fc2ab765e31d34aefe69602bb26f3750 SHA1 a198b0d2219f20fbb028a8f638bf5bf4168c1082 SHA256 ce1fc092ecf60a161b200dd4581551dcb660842d7e5490dffd26329ffe5ca684
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt4jc8ACgkQr2QksT29OyCQcQCeLVmzhlTlID8mxkmRBTzyJW2Z
-qKgAnAgBAWfzgX8atXB+SiFPbC7YXwSu
-=kz9E
+iEYEARECAAYFAkt4kK8ACgkQr2QksT29OyBymQCePGxlwxdms+fVhBWriZvPxfg8
+3wgAoKQ+Ny/FVDXBSYGQfGijcU02sAHz
+=1eMv
 -----END PGP SIGNATURE-----
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 \