Fix building with libpng15 wrt #373521 by Stuart Longland

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 76 insertions, 18 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 5f37c2146e22..2ae834892e01 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.182 2011/08/11 09:13:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.183 2011/09/30 22:11:48 ssuominen Exp $
+
+  30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> fltk-1.1.10-r2.ebuild,
+  +files/fltk-1.1.10-libpng15.patch:
+  Fix building with libpng15 wrt #373521 by Stuart Longland
 
   11 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   +files/fltk-1.1.9-share.patch:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index d8a91e083b65..8043e917ba15 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX FLTKConfig.cmake 1217 RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 SHA1 2b09f60de6ae8ba1c1d625240e734b0413e643ca SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e
 AUX fltk-1.1.10-includedir.patch 1163 RMD160 f3433f4e4b229e06897ee94be105dfc6e9076fa7 SHA1 55838393a5307e5be69dceb523a25e3c5d1dbde9 SHA256 0105911341d2d0a76fd051120128a34384daf27591a129c3c8b740fb6b5ccd9c
+AUX fltk-1.1.10-libpng15.patch 1845 RMD160 b725decb31dcdda3e63171ba9e367e745b15fdd0 SHA1 2947322303f86d2f243eb7317f8a2eff88c36fab SHA256 3d7a055197b50c8466d2c366edc12dfa136eb2d744f8a499cd6fc7c6c0b4ad34
 AUX fltk-1.1.9-as-needed.patch 4176 RMD160 a4aa9a3e985a77b1355ef0653f603ac9ec2ab35f SHA1 b28366c4721a6406968594ff33fe72dfe5a72b18 SHA256 63168426ee87d57b7105934c2a0f4655403d6c6d0657b8448f32cfc40131b16d
 AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca37ff8 SHA1 91403efd58b94bf2928a3ebed1e052f2b249f656 SHA256 24aaa8187f3218b9b6c8f16756b3167c8107a6022d312aabec666ead96e4b211
 AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147 SHA1 d470b0a87839d6cde6ee5f0034a4cfdb6bb87d73 SHA256 366dd980d8d0bcfd0e5b1010316caf9103437976a8a10a0dd7b12943782dc082
@@ -24,27 +25,21 @@ DIST fltk-1.1.10-source.tar.bz2 2214382 RMD160 f8fc4371811efcc0d6fc73edd0525d8ff
 DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
 DIST fltk-1.3.0-source.tar.gz 4111004 RMD160 dea1eb42ae1b81efa22a54198956211367e2945a SHA1 720f2804be6132ebae9909d4e74dedcc00b39d25 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
-EBUILD fltk-1.1.10-r2.ebuild 3910 RMD160 4e85a0cc4563cf47b9ccdbb961dba9c46d8f8d7e SHA1 8a7d43b54efa23976f0d38b424af6e06da12dc91 SHA256 c3529044c3ad76eec275fc3172a9404cbc981146ec4758d2056767c7d6860882
+EBUILD fltk-1.1.10-r2.ebuild 3954 RMD160 8ce440d034f56132c3f0643ab26c82418240e5f4 SHA1 dd5f96c658b868b8f626d6f47d0f347492620127 SHA256 54af9013f46f5a0b0b44642f2abfdf75551f4e8052fd0423fb5364b5a5ce5830
 EBUILD fltk-1.1.9-r1.ebuild 3619 RMD160 2bd5e83b47f77db7c566dd2e3c353a63f74d5117 SHA1 46f3f8a20abe86a615b614f639a272b546af3c0a SHA256 8eb271dff418f167f8886fc6de4157f6d346d07de91187a5506378b95c752dfd
 EBUILD fltk-1.3.0.ebuild 3851 RMD160 62477c2590f66ec3e4b1f1b7013b0d7a45592649 SHA1 36a90ccf20ffeb5bd988b6ef61e1b6fba2ae13ff SHA256 69efd0b91729c31335876d76920c5d01ec639b4a598c85ba1e9c738ef9bda7a0
 EBUILD fltk-2.0_pre6970-r1.ebuild 2643 RMD160 3f2586e399d6d8d528458de6290474c6d8f71745 SHA1 231219d7b2a21b5f19fae8c1381add0c3d44b61c SHA256 30bcdb648e978978ea3f6e183efac6f02f008fbe345cde19c3257ad95e50a2d6
 EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd
-MISC ChangeLog 26066 RMD160 3070ea0373a9d731fdb4a8813b200fba6d3ae06b SHA1 fe4a1ff0d060883306deb8d9b121ce763c82ff4f SHA256 a03b687927f28e0869ebabf6e09e799d034d1181c7897867ec0dfafba0408cf5
+MISC ChangeLog 26242 RMD160 a9ee3316e143644e963807c9d88208bfbebab132 SHA1 ab41d884a3ae269b3afb175201e732d12a43b53d SHA256 edcb3d5e2222d74eb0171806e9fd968fb5dd646826fefa1d51d2ea2264764959
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQ50DAAoJEPqDWhW0r/LCl9IQAKFi2DfRe7a94hKoVFqEG/T0
-nATlpcO2sSF/AxAy2w8VH3vRb5nWfRHqFOP6xhA5gwJwljSLJ1lU4/D+XR2UyyW8
-pcBtxVC4a0hc8pikbD3HJOQbLsihXTcoPbT0+FbIAB8yjRlw2kaiHX1xjTZEInqZ
-bQPcZqm+hP+8Q+Q1ds49FI+c940nkS6zotcW1bNgH76ggk0mt0rqm2NOdnAGc02M
-RIEV1gOl79yenQzIpdK04jWfO7PzE7hCZCaLZbiMprU+u7EAWzUQuSxhFNUNUkRw
-UH5Zc7BvRLug7rpyE3E6M0tGET8KBPxUgNLHAGO+Gu7KccUucgy8Vs0+uxVAuC5P
-Qe2dRaufVJ0Q1CksnvT3DhV8iNfm4qKx6fSb84hT1Y/Ddzn9INT8W7QhNnlWVpvw
-glbM4EIs4VnKsUPla2NqimtPvVNOMLtrQ923QQLtvPtDU7V4lu+6i1hCsZkpov0M
-OeqyjCioF2AsryEGm1IIF/IK19GyfEPYZuR6TuEW9FneVxpGcmwg62/C+llTjnuL
-TKksyKIXMIblpwdWZssN4hBtIhAW1BXDTOl83AmsHi88iwMKg7LEO8e96tdcCB+g
-8y4/b7gaoTfWVy9H8VmGL6Q9VtU+1ynKfapqhYlODUHK49u4xY/hJ0qXd8xB0Wb2
-ZAfexQBhE/xLx3RZnpA3
-=hAFQ
+iQEcBAEBAgAGBQJOhj7KAAoJEEdUh39IaPFNq1YH/26L1Pr+TKMBnWFhgq0NfeQw
+n6+GkDPR1bVZRQ7UE3GlLpehy792IVyezpTWVmGxaOwd1tlHPhSoic4Knw8XJItJ
+PCtf0jBwCfaaiXoPlSsc4WuXH5OseI6D9BEjt4H/brefSVENFXNKAcUHYZMg7PRy
+gbDl6g3g09ZPrBgMDeOzJfTqs/0sTDTbWp2e8bgk0EVRgLAbm7rlS0iCQZAT9DOG
+q3GVpr+sNT/iFT+52IKJhFnK6dAxD4d2aGbQuHM+ULfy/vKY6qq1YvUrLfjIBxQq
+pwAHJWt20fe9G0V+NzAEAVakkHdezEKqR2z2Hsvaf9gmz7OIFDYSg0VqWgthoR8=
+=iyYv
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch b/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
new file mode 100644
index 000000000000..a240be99efb6
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
@@ -0,0 +1,58 @@
+--- src/Fl_PNG_Image.cxx
++++ src/Fl_PNG_Image.cxx
+@@ -66,7 +66,8 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   png_structp	pp;			// PNG read pointer
+   png_infop	info;			// PNG info pointers
+   png_bytep	*rows;			// PNG row pointers
+-
++  png_byte     color_type;             // PNG color type
++  png_byte     bit_depth;              // PNG bit depth
+ 
+   // Open the PNG file...
+   if ((fp = fopen(png, "rb")) == NULL) return;
+@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct(pp);
+ 
+-  if (setjmp(pp->jmpbuf))
++  if (setjmp(png_jmpbuf(pp)))
+   {
+     Fl::warning("PNG file \"%s\" contains errors!\n", png);
+     return;
+@@ -86,28 +87,24 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+ 
+   // Get the image dimensions and convert to grayscale or RGB...
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
++  if (color_type == PNG_COLOR_TYPE_PALETTE)
+     png_set_expand(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
+-    channels = 3;
+-  else
+-    channels = 1;
+-
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+-    channels ++;
++  channels = png_get_channels(pp, info);
+ 
+-  w((int)(info->width));
+-  h((int)(info->height));
++  w((int)(png_get_image_width(pp, info)));
++  h((int)(png_get_image_height(pp, info)));
+   d(channels);
+ 
+-  if (info->bit_depth < 8)
++  bit_depth = png_get_bit_depth(pp, info);
++  if (bit_depth < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (bit_depth == 16)
+     png_set_strip_16(pp);
+ 
+ #  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)
diff --git a/x11-libs/fltk/fltk-1.1.10-r2.ebuild b/x11-libs/fltk/fltk-1.1.10-r2.ebuild
index 7607e820ae3c..fc6b26240148 100644
--- a/x11-libs/fltk/fltk-1.1.10-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r2.ebuild,v 1.2 2011/05/01 17:14:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r2.ebuild,v 1.3 2011/09/30 22:11:48 ssuominen Exp $
 
 EAPI=3
 
@@ -37,6 +37,7 @@ INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
 LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 	# backported from 1.3.0
 	epatch "${FILESDIR}"/${P}-includedir.patch
 	epatch "${FILESDIR}"/fltk-1.1.9-share.patch