Fix building with libpng-1.5 wrt #378919 by Diego Elio Pettenò <flameeyes@gentoo.org>. Add explicit dependency on sys-libs/zlib

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

4 files changed, 61 insertions, 10 deletions

diff --git a/sci-misc/h5utils/ChangeLog b/sci-misc/h5utils/ChangeLog
index 893590242491..6cfe0cd804d1 100644
--- a/sci-misc/h5utils/ChangeLog
+++ b/sci-misc/h5utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/h5utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.13 2011/08/25 16:47:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.14 2011/08/25 17:22:18 xarthisius Exp $
+
+  25 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> h5utils-1.12.1-r2.ebuild,
+  +files/h5utils-1.12.1-png15.patch:
+  Fix building with libpng-1.5 wrt #378919 by Diego Elio Pettenò
+  <flameeyes@gentoo.org>. Add explicit dependency on sys-libs/zlib
 
 *h5utils-1.12.1-r2 (25 Aug 2011)
 
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index a4c11d0d7369..2a5ffb415e85 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX h5utils-1.12.1-automagic.patch 2226 RMD160 1fb63952a15a752726a3330366b20b3b04643be1 SHA1 42205dd82302b3d165296bfc5df4e5210df39ef6 SHA256 e69b005a086749e530a037f37ca5069473947bfb21b2f9dc98e470c26cc0c69c
+AUX h5utils-1.12.1-png15.patch 1420 RMD160 bd004c77cb3ed4e4f59b2cb54c479c618453bf46 SHA1 3e6d30e1cccaf93f9c403b03af1eed90d4c9cb0c SHA256 45e326080589e9e05da81d5a4ce15e0df5991e13f2ded1d3d34e30fa94593c7a
 DIST h5utils-1.12.1.tar.gz 156785 RMD160 f7d1d1b9254e5946c382fad2bd5ffc41e238860d SHA1 1bd8ef8c50221da35aafb5424de9b5f177250d2d SHA256 7290290ca5d5d4451d757a70c86baaa70d23a28edb09c951b6b77c22b924a38d
 DIST h5utils-1.7.2.tar.gz 116927 RMD160 f13d1ed6c95206f32e8462ae2015dc55c25b8db3 SHA1 3ec581bbb59397a21ea39b129b1f6354bf242b29 SHA256 ced462d7fc51a43789a284efc346c94c4dfa6a4d8754f87584ffdd694f060e5e
-EBUILD h5utils-1.12.1-r2.ebuild 851 RMD160 91b29dce2dbcf07aa427f75a1a7b02d9af9c006e SHA1 4c737334d59c4a80f4140c612cd6b061bc742b3d SHA256 512d7e7b27556fae5a9d989d0ed832b6047dc7db9f84e370cb15a9eefc7521d9
+EBUILD h5utils-1.12.1-r2.ebuild 901 RMD160 8a9d387f086dbc05436cb960da07c2df603213bb SHA1 0408232d749bde38825120dfb86d6291dc5b5775 SHA256 1087547a20324fb04ef460d80e5e6ebfcbe9cdecbd975f5ed83bdf8152c1c14f
 EBUILD h5utils-1.7.2.ebuild 632 RMD160 d266b1cbd0f8a2f9e8f37e9f139c4915156a7575 SHA1 9cdd29d30e050a785e458baa67f122a48a1f8714 SHA256 091c1e9ea801d94bea9a7425d784327ad20ef67819161293c222bb1166dd1d0b
-MISC ChangeLog 2701 RMD160 ba19570da207e27477633fdef4cae59af22db528 SHA1 dc533fc3b599f39dc6b0fe4a1201741cbb8c2224 SHA256 ba9fb48d690995984c423f0064fd095ad0eaf13c28de362a204fa6e5c1e8e53f
+MISC ChangeLog 2952 RMD160 13c2c0db65059a39ff2e65939b2247cd3f2f99f5 SHA1 62bef34921dfb651150a147dc3e9eb0ffc9b8a17 SHA256 222f11c238b0eac605a865ffffa08220034a58ad56871a718c82518e10e093ae
 MISC metadata.xml 290 RMD160 312192828583c46dc9342aa15a2939fad901ca95 SHA1 665f4d94e197b4b055d8e86034aa3f7fbdb145c3 SHA256 1ea962e3a289f9e2a618ba538bc8432bf504a8a5fe249b33084f5fde4d2f1885
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5WfL8ACgkQIiMqcbOVdxTMqwP/QaIV8A1VcUGzJTIEoieSy3/d
-IAWazLt0LhrlSXR1kGKgMNq9PFcFqj/fsR+cYFrqlLE7uxhV2gGkZASP5cGSOhaq
-z2fKHtuLS37vxf2WBfLziL9DkQQvGxdVHOfTQr7gjsIzlngOUw2KmzgwlnMMj0LD
-AVJeIpJ0XWJTSsLIyiY=
-=JTVX
+iJwEAQECAAYFAk5WhNMACgkQIiMqcbOVdxSu+wQAh7/l5vYZSyCVz087t2q8Y9Au
++79zFpMNR3LByEEZ9bUXzZ0rGSS9vjhjohxCypL5YML6oWg52tjP8KG7ped+RYBM
+UF4TxBbWYAFXJTcFgIDL2YCpVBqSiuaxpjlOy2/Tyu56jqP8yC2KYirVt8Qarwkn
+gdSgNJ5VVrwJH5pJaD4=
+=P+x5
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch b/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch
new file mode 100644
index 000000000000..e611310145eb
--- /dev/null
+++ b/sci-misc/h5utils/files/h5utils-1.12.1-png15.patch
@@ -0,0 +1,43 @@
+Fix build with png-1.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=378919
+
+Patch stolen from NetBSD
+--- writepng.c
++++ writepng.c
+@@ -240,6 +240,8 @@ void writepng(char *filename,
+      double skewsin = sin(skew), skewcos = cos(skew);
+      REAL minoverlay = 0, maxoverlay = 0;
+      png_byte mask_byte;
++     png_colorp palette = NULL;
++
+ 
+      /* we must use direct color for translucent overlays */
+      if (overlay)
+@@ -309,7 +311,7 @@ void writepng(char *filename,
+      }
+      /* Set error handling.  REQUIRED if you aren't supplying your own *
+       * error hadnling functions in the png_create_write_struct() call. */
+-     if (setjmp(png_ptr->jmpbuf)) {
++     if (setjmp(png_jmpbuf(png_ptr))) {
+ 	  /* If we get here, we had a problem reading the file */
+ 	  fclose(fp);
+ 	  png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+@@ -334,8 +336,6 @@ void writepng(char *filename,
+ 		       PNG_INTERLACE_NONE,
+ 		       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+      else {
+-	  png_colorp palette;
+-
+ 	  png_set_IHDR(png_ptr, info_ptr, width, height, 8 /* bit_depth */ ,
+ 		       PNG_COLOR_TYPE_PALETTE,
+ 		       PNG_INTERLACE_NONE,
+@@ -434,7 +434,7 @@ void writepng(char *filename,
+      png_write_end(png_ptr, info_ptr);
+ 
+      /* if you malloced the palette, free it here */
+-     free(info_ptr->palette);
++     free(palette);
+ 
+      /* if you allocated any text comments, free them here */
+ 
diff --git a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
index b9497503360f..90bbe17f54eb 100644
--- a/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
+++ b/sci-misc/h5utils/h5utils-1.12.1-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/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild,v 1.1 2011/08/25 16:47:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild,v 1.2 2011/08/25 17:22:18 xarthisius Exp $
 
 EAPI=4
 
@@ -18,6 +18,7 @@ SLOT="0"
 
 DEPEND="media-libs/libpng
 	sci-libs/hdf5
+	sys-libs/zlib
 	hdf? (
 		sci-libs/hdf
 		virtual/jpeg
@@ -25,7 +26,8 @@ DEPEND="media-libs/libpng
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagic.patch
+	epatch "${FILESDIR}"/${P}-automagic.patch \
+		"${FILESDIR}"/${P}-png15.patch
 	eautoreconf
 }