Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 105 insertions, 14 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 8d268db93fcf..42197610b712 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.119 2010/01/07 22:04:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.120 2010/03/10 13:44:18 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  fontforge-20090923.ebuild, +files/fontforge-20090923-libpng14.patch:
+  Fix building with libpng14.
 
   07 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   fontforge-20090923.ebuild:
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 05a5772d0df4..bc46190d44de 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontforge-20090923-configure.patch 1024 RMD160 e4e9748b8b09ff475d576a221ff5a69af65ea2ef SHA1 4f18b1f1925d91abd451d4813afa0c1fa6855b34 SHA256 491fe813756d0ed693777d707da20ca16a97cf09274e92acdb72f8e7577b424f
+AUX fontforge-20090923-libpng14.patch 3458 RMD160 29386acf679e0cf4160fd0fce4830bf941874d3f SHA1 3e3f8575621de7b745868dde672cef6a6a826996 SHA256 4cd01772061dcf10555cb0d67dad27a05d6ea004f0e5eb01cc2e76c9878ed797
 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
 DIST cidmaps-20090121.tgz 314314 RMD160 d194355e61813d31fe4813bdf10a62d66a9f6d04 SHA1 efbc7c9d3e95159f5600dc71f9cccb370e46bb94 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3
 DIST fontforge_full-20081224.tar.bz2 5236663 RMD160 c62db87e24e709734dff1b45c97c9b43b27c2e15 SHA1 be6863a96cadaae419a14fb055b7e6b5cb20af9e SHA256 1748614a0d36a1ea44cef276ad2e04e884cd0e6e0f6965a71ed0c055e6ad06fc
@@ -12,13 +10,6 @@ DIST fontforge_htdocs-20090622.tar.bz2 2764464 RMD160 6b8a319a5b2825ffaa5436bed2
 DIST fontforge_htdocs-20090914.tar.bz2 2828545 RMD160 74322d2d38f8321465b6fb9d7951f6be9503b46f SHA1 fc4b7dde7ba318691934b53cd72aa683bcd5e48f SHA256 3f9e6ed8dfb9d1a67c1311289bbe6538b8f20439cbe8bb6e56de6c688ad5ab57
 EBUILD fontforge-20081224-r1.ebuild 3306 RMD160 af710ce85cbbe039ec19a168a16c450edf93c4d6 SHA1 c4784edb800035c7fac046c9c8441bbf3ccf818f SHA256 9621a2edb36917df3d5869044f9f87bc0440947748c48a6def366af1051950bf
 EBUILD fontforge-20090622.ebuild 3436 RMD160 335b22027cac3b1581cbe4279d60b7645cf38d00 SHA1 09a32fe961f9d7a7f2e2c0e5aa394f242a7ffaf6 SHA256 7ae2cc82779af7e4e4b881425857eb4eefc8fd9683f570bea9f46460be323728
-EBUILD fontforge-20090923.ebuild 3575 RMD160 b89e2333003efee6162c4c73b78235d2d9d50b29 SHA1 8034d708e4c2bf7f907fd88d0e7eeda9338d1663 SHA256 2142f5b0ddc5be359bcaa96d1cb0e4a680ce7ec11b2973f884bedd84cf7a0a8a
-MISC ChangeLog 17694 RMD160 f83d05f1f373e20405ca80cc5b1cd74116c97a99 SHA1 eabcc3ebd7c052616dcde60675220a7948c1ccc3 SHA256 bf0b55d1e544ad6090a59afa4f98aa8f5eae8c0a85319207a8791089d42f070a
+EBUILD fontforge-20090923.ebuild 3722 RMD160 2b857696adfe939713d20860b3e43fd99b5affd7 SHA1 34e706ac8701bef695d31eaa81cc5a7fe4801ff8 SHA256 c1921f33869e2ec30a664efd92b51a171b037d741290ccb28e19b0ada2da5844
+MISC ChangeLog 17854 RMD160 2ed12e581be56c050acc30af1179131f52505b09 SHA1 003ee5e40b521ddfb1db90aee84f95911cfc3901 SHA256 2c0e8476f20d2b3dd3f312dc9c0e58aa79d713eee324676c3c77ac678e8b186f
 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGWnkACgkQNQqtfCuFneOu8gCeITr8FaQSGJWvftZDFwzQHysC
-vEcAnjzX4lw0up+ZALERV2eXy7X6A/Qy
-=+D9Y
------END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch b/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch
new file mode 100644
index 000000000000..f72cf9ec08f1
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20090923-libpng14.patch
@@ -0,0 +1,91 @@
+http://repos.archlinux.org/wsvn/packages/fontforge/trunk/libpng14.patch
+http://www.mail-archive.com/arch-commits@archlinux.org/msg11199.html
+
+--- gutils/gimagereadpng.c
++++ gutils/gimagereadpng.c
+@@ -220,13 +220,13 @@
+     if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) {
+ 	if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA )
+ 	    base->trans = COLOR_CREATE(
+-		    (info_ptr->trans_values.red>>8),
+-		    (info_ptr->trans_values.green>>8),
+-		    (info_ptr->trans_values.blue>>8));
++		    (info_ptr->trans_color.red>>8),
++		    (info_ptr->trans_color.green>>8),
++		    (info_ptr->trans_color.blue>>8));
+ 	else if ( base->image_type == it_mono )
+-	    base->trans = info_ptr->trans[0];
++	    base->trans = info_ptr->trans_alpha[0];
+ 	else
+-	    base->clut->trans_index = base->trans = info_ptr->trans[0];
++	    base->clut->trans_index = base->trans = info_ptr->trans_alpha[0];
+     }
+ 
+     row_pointers = galloc(info_ptr->height*sizeof(png_bytep));
+--- gutils/gimagewritepng.c
++++ gutils/gimagewritepng.c
+@@ -183,8 +183,8 @@
+        if ( info_ptr->num_palette<=16 )
+ 	   _png_set_packing(png_ptr);
+        if ( base->trans!=-1 ) {
+-	   info_ptr->trans = galloc(1);
+-	   info_ptr->trans[0] = base->trans;
++	   info_ptr->trans_alpha = galloc(1);
++	   info_ptr->trans_alpha[0] = base->trans;
+        }
+    } else {
+        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+@@ -192,9 +192,9 @@
+ 	   info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ 
+        if ( base->trans!=-1 ) {
+-	   info_ptr->trans_values.red = COLOR_RED(base->trans);
+-	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
+-	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
++	   info_ptr->trans_color.red = COLOR_RED(base->trans);
++	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
++	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
+        }
+    }
+    _png_write_info(png_ptr, info_ptr);
+@@ -210,7 +210,7 @@
+ 
+     _png_write_end(png_ptr, info_ptr);
+ 
+-    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
++    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
+     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
+     _png_destroy_write_struct(&png_ptr, &info_ptr);
+     gfree(rows);
+--- gutils/gimagewritepng.c
++++ gutils/gimagewritepng.c
+@@ -314,15 +314,15 @@
+        if ( info_ptr->num_palette<=16 )
+ 	   png_set_packing(png_ptr);
+        if ( base->trans!=-1 ) {
+-	   info_ptr->trans = galloc(1);
+-	   info_ptr->trans[0] = base->trans;
++	   info_ptr->trans_alpha = galloc(1);
++	   info_ptr->trans_alpha[0] = base->trans;
+        }
+    } else {
+        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+        if ( base->trans!=-1 ) {
+-	   info_ptr->trans_values.red = COLOR_RED(base->trans);
+-	   info_ptr->trans_values.green = COLOR_GREEN(base->trans);
+-	   info_ptr->trans_values.blue = COLOR_BLUE(base->trans);
++	   info_ptr->trans_color.red = COLOR_RED(base->trans);
++	   info_ptr->trans_color.green = COLOR_GREEN(base->trans);
++	   info_ptr->trans_color.blue = COLOR_BLUE(base->trans);
+        }
+    }
+    png_write_info(png_ptr, info_ptr);
+@@ -338,7 +338,7 @@
+ 
+     png_write_end(png_ptr, info_ptr);
+ 
+-    if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans);
++    if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha);
+     if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette);
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     gfree(rows);
diff --git a/media-gfx/fontforge/fontforge-20090923.ebuild b/media-gfx/fontforge/fontforge-20090923.ebuild
index c1ba5e20181d..b63fad6c566f 100644
--- a/media-gfx/fontforge/fontforge-20090923.ebuild
+++ b/media-gfx/fontforge/fontforge-20090923.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/fontforge/fontforge-20090923.ebuild,v 1.4 2010/01/07 22:04:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v 1.5 2010/03/10 13:44:18 ssuominen Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -60,6 +60,11 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/fontforge-desktop.patch
 	epatch "${FILESDIR}"/${P}-configure.patch
+
+	# info_ptr->trans_alpha might be no-go with libpng12
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	eautoconf
 	if use doc; then
 		cd "${WORKDIR}"/html/