Fix building with libpng15 wrt #387437 by Ruggero Morsucci

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

4 files changed, 39 insertions, 10 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 5660272ec090..3b06b3f086f7 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.59 2011/07/27 17:38:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.60 2011/10/17 18:12:36 ssuominen Exp $
+
+  17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> paraview-3.6.2.ebuild,
+  +files/paraview-3.6.2-libpng15.patch:
+  Fix building with libpng15 wrt #387437 by Ruggero Morsucci
 
   27 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> paraview-3.6.2.ebuild:
   Fix for python 2.7 wrt #348151
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 9349f31f5b3b..416231dd80fd 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -8,6 +8,7 @@ AUX paraview-3.6.2-findcg-cmake.patch 1152 RMD160 d32da54534c104ca6b3e9bd088b464
 AUX paraview-3.6.2-h5part.patch 467 RMD160 bd34e8bf02a1855dcfeabdc77cac39bd78a41492 SHA1 8416ef8a782425624b04c28c379d383e8f924c44 SHA256 ea46a024d8cb398c93dabee22ac2bef66af3771477811551275bfa85a765cc3f
 AUX paraview-3.6.2-hdf-1.8.3.patch 2701 RMD160 0c6399a18041597c53a856f20e986587b0a9d334 SHA1 c10beace922a3c2566ca7e38c3bf28c746211d96 SHA256 7a283a8ce1d03ddbe93e1d0aae5b26e4b7034607e40472620dbd51869c6015da
 AUX paraview-3.6.2-libpng14.patch 2228 RMD160 fb238b1a097ba97ca722d1c4a838707c43efaa97 SHA1 d4ebe66a41b60bfca41857e2fc2bed54a5d5b676 SHA256 9e8b69475c71e3c7465a12447cae4f5a963fc373c84eebefb11bce9e230a8df2
+AUX paraview-3.6.2-libpng15.patch 703 RMD160 d39fb05da9d198886bedd7d6ec03dee5fae3dc36 SHA1 96d1649c5e6066a67d3240f7580221c254bfca52 SHA256 4f0f6ad7580cba3d3cf131b4178bf1dc8375ae9896adabe87e4dd756d592de25
 AUX paraview-3.6.2-no-doc-finder.patch 773 RMD160 0d76cb7cbd73049473fcd82244b6f4e3766b4276 SHA1 68e0e162f9ebb4bf3d231dbed62ecd53647457b3 SHA256 c90134760ea0995d69f35dc4f5e1d3c43faa4288c2b35cec03a5ece809b6675b
 AUX paraview-3.6.2-odbc.patch 382 RMD160 5df235adc6298466bccab6f2acd9f9eda002deb2 SHA1 f3b3da241342cbf042d0801912b6881d2f9899aa SHA256 ea7ef1df1ed3319f996f1318579c87d362ccfd78f3c4c094ed80aa226b56a1f3
 AUX paraview-3.6.2-pointsprite-disable.patch 608 RMD160 07f18332dc7d1313d0909ef7c2bcdfaf9c7d8ec4 SHA1 6602447fc07dacddd7a89ce163213fad1eb76386 SHA256 066559838cbe54408e3d5f17c5ca132e76757ea371a055def27ec710c2df2048
@@ -15,15 +16,17 @@ AUX paraview-3.6.2-qt.patch 7324 RMD160 e5038a2642eee257008181ee3bcba0b1fb95dc62
 DIST paraview-3.6.2-openfoam-gpl-r173.patch.bz2 3402 RMD160 2ceb036486b2757eeeed8eae36593be2a70a3a36 SHA1 ea2ac1f92b529973164469c5fc3fdbc0407f8ccd SHA256 3e8751f7747a0067b8532d399a4dc253c71ce50d39fc3b17d38e16060196fc99
 DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a2908600d911627b24 SHA1 ca255ec222e9f8884f4e090df8e860946246b249 SHA256 87c62931de1484dd71fe2f1b36eafdb85eb27127cb42825819a67730118ae6ce
 DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
-EBUILD paraview-3.6.2.ebuild 9664 RMD160 f54cf53af0c5528b48d82e55be46ba2006dc8678 SHA1 8e0fe062fd9334e07456525e5a520e6ea60247d8 SHA256 d529f7e526fc0a636ca14c7eecc7b012dc9c86e08b11c48f1fa30f508b66c826
-MISC ChangeLog 12217 RMD160 2b8a2cea1b0abbe3874c50838d06e61048c19053 SHA1 921a6b50f986f853927c1d89537939445c759e71 SHA256 71ee6ff8658b1f3cd10d3537f8c596bcce599eb6321fbfa9138ca0162e5cefa9
+EBUILD paraview-3.6.2.ebuild 9705 RMD160 8a610df24e4ad53811bdfe609f6f17c770baab47 SHA1 8e0d699ed19bf43efe4e23ee2d2d55ccf4bd5fb9 SHA256 515516233b347d86c5791aeb302d27358380b71a9f10d906050aa03c99fafb8e
+MISC ChangeLog 12395 RMD160 3286c2e4cea4b852c037d0021f986e6ed58aec2e SHA1 bc427ca1973fc639dbf4690c525af3a749c7287b SHA256 a4eaea98f80a7bbbcf73d1fdbb5bf560f4e77badad480ad1036e59de2e7c3900
 MISC metadata.xml 568 RMD160 d44613fcc6b3dc955197867f9e93fcfc9620a7aa SHA1 5818b0ac73fdb158a6d0cf010df85663a1219132 SHA256 2e7d9258b0f11c618647bea07ebb91f84c8cac7ee830640d80c2a5fe03959b66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4wTTEACgkQIiMqcbOVdxTijQQAj+OpMYuNBdZQZH9+tQfZKdua
-jVT8LEnCI3UJPtf70RKQZFejRrSMvbPv0yWbZqrUm4sFzsn8ScqUG0BATJAjlbhC
-7AN5bSna42R7DtpTOYBDlOfxzjwb77XBKiJxUBN+5U/xQxNYMJ4qgk2HNz+OR4v9
-+YkIvtNHJjz8/uFJY8w=
-=NNrf
+iQEcBAEBAgAGBQJOnHAFAAoJEEdUh39IaPFN0aoH/AnhrMwH4KL0YsD8THbXYo4X
+0H6FHzHm4TdKOvl1heCECDeF8q3Re60x9bqmGmytGq7zqqSYYhQEyjhnVpZbxfqp
+G47MxAPDDOV6QWOhWTmNfKc2f3shCgY7HIW/StUdSmzuq7lyAh8+XMsxbU3zdy4H
+UgrltJhmjA8aEBnx5eDddX0ivcap+xaeRwhqIdwB3Q8eWJaYLQl+N9dZ2WdFQqL5
+PrEWl/ExFNGBwowBDDZHa6fKqibpxOTI58PX956ZmtP/ik/E5JjT9Ur3kG9Nhcdo
+eK5e1c3reykJgxlH58IqWmgWPIwfG3TjZRuKZEDVPpJ/0HnYCz3RJYefiJ0ajmU=
+=drqQ
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch
new file mode 100644
index 000000000000..0fb717a561f8
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch
@@ -0,0 +1,21 @@
+--- VTK/IO/vtkPNGWriter.cxx
++++ VTK/IO/vtkPNGWriter.cxx
+@@ -148,7 +148,7 @@
+   void vtkPNGWriteErrorFunction(png_structp png_ptr,
+                                 png_const_charp vtkNotUsed(error_msg))
+   {
+-    longjmp(png_ptr->jmpbuf, 1);
++    longjmp(png_jmpbuf(png_ptr), 1);
+   }
+ }
+ 
+@@ -224,7 +224,7 @@
+       png_init_io(png_ptr, this->TempFP);
+       png_set_error_fn(png_ptr, png_ptr,
+                        vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction);
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+         {
+         fclose(this->TempFP);
+         this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError);
+Only in ParaView3/VTK/IO: vtkPNGWriter.cxx.orig
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index 6de9fa45cd62..ddd2190a7b79 100644
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.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-visualization/paraview/paraview-3.6.2.ebuild,v 1.16 2011/07/27 17:38:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.17 2011/10/17 18:12:36 ssuominen Exp $
 
 EAPI="3"
 
@@ -74,6 +74,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-odbc.patch
 	epatch "${FILESDIR}"/${P}-h5part.patch
 	epatch "${FILESDIR}"/${P}-libpng14.patch
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 
 	if has_version '>=sci-libs/hdf5-1.8.0'; then
 		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch