Fix building with libpng14 wrt #319397 by Helmut Jarausch.

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

4 files changed, 55 insertions, 14 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index dcb70b8b551f..08a8bf54e834 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.47 2010/03/09 12:10:25 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.48 2010/05/12 12:59:07 ssuominen Exp $
+
+  12 May 2010; Samuli Suominen <ssuominen@gentoo.org> paraview-3.6.2.ebuild,
+  +files/paraview-3.6.2-libpng14.patch:
+  Fix building with libpng14 wrt #319397 by Helmut Jarausch.
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> paraview-3.6.2.ebuild:
   QA: When not using an absolute path, you MUST NOT use a file extension
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index ce027137cf66..0d6827c4a299 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX paraview-3.6.1-assistant.patch 1122 RMD160 4f6ecb6bd6105b3b4a5a7848782cfe92e6741d18 SHA1 81b47c0a30336fbfb45d55f2480474c994d7f820 SHA256 62fbe1310ee8f0c2405ff12cfe9edb50100e654678e7fb823f78084f284130d3
 AUX paraview-3.6.1-hdf-1.8.3.patch 2763 RMD160 f6a557565e75541e74b7052cdbd797e56e39f85b SHA1 d70f2b2715b3cebecb2db82d8c05b60fbb0220d1 SHA256 97247cc3fcb887de3bbf73a80ecda270c7f282802c365b21f20c518b76f2d3be
 AUX paraview-3.6.1-install-fix.patch 6861 RMD160 4c65e8f95670a740b67146cbf943e8d6340e4857 SHA1 17d02c81884f5a1c56832a26026265e53aa18566 SHA256 aa991a873f3f692981df75ff20dc67d55ab38fc8de2ee3b11d05326419d4b2c1
@@ -13,6 +10,7 @@ AUX paraview-3.6.2-boost-property_map.patch 1212 RMD160 7f7c37cf57fee96774d10104
 AUX paraview-3.6.2-findcg-cmake.patch 1152 RMD160 d32da54534c104ca6b3e9bd088b4644590c24f8d SHA1 ab89deef0fb2760cf52c299298f511dd4e43cd92 SHA256 6f51bf693800e8d1d8112f15a793283d4672617c0f7385ad908af97f7f067db0
 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-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
@@ -25,13 +23,6 @@ DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a
 DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
 EBUILD paraview-3.6.1-r1.ebuild 9571 RMD160 b3f54c931f6f1d1ea0b021f1e47c92910613c65e SHA1 2ce54d3de1ccc2a156ee699c9fa4b399c697318a SHA256 efd2af6317b8b4ac710f11c1b54a341cf74affe5b02546bba0ec58efcefaf24e
 EBUILD paraview-3.6.1.ebuild 9491 RMD160 f7677e326122f8303452f2e04be6b5594d63d685 SHA1 7150ec41d01de82c381e4335d048b09bf7b04f6a SHA256 79c2ad8a1b7ebc7f3abe2f628c7ee15fc304a161c307f042b9e4ad631410c970
-EBUILD paraview-3.6.2.ebuild 9426 RMD160 c591232526059a513af3f307e3361bd2add1b752 SHA1 06aec67f21669b6771fc7a29a7a527e5af03b326 SHA256 3058bfada042ac50aacc2c06dfb19f41c148f568e4ab4df90b325b8042b01705
-MISC ChangeLog 10437 RMD160 4bf4b2f9317217a76e151aa2e57f1635b6d377da SHA1 6b9a14b00c1b5f969fd872fa6d0ca7bfd79f39e5 SHA256 f552b8d54056cef985c4ad04c65305c9fc1c882aa95e210242b1e011d2225d7c
+EBUILD paraview-3.6.2.ebuild 9473 RMD160 3ee6c6a0574299a2b5f773252892e9f26ed00bd7 SHA1 20a06d6050d32418e38dec84a914cc4408d5a963 SHA256 b3875b653da2c46178e1bc5300e5b28f1258f0d36293dbf1b337c5181e924726
+MISC ChangeLog 10621 RMD160 deb14c917312654d9e36fbfd9d1f13ddf637ad7a SHA1 23ec838babace73e6b38538f30413f1f4983a386 SHA256 6592e3b38308904cb9dff11fac66c7dc08a0247cee3ae8feab13a676dcab3550
 MISC metadata.xml 665 RMD160 e1e973749b838df0d1e6f08874c7e29f45a18381 SHA1 4be610c3d1f9eeca08ad57eedc90f937f69c5d39 SHA256 07414d0fbe0b6091fe16769a967d1b5b6e20c40e6c871f7e31f2135b11b5d932
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuWOrcACgkQOypDUo0oQOo5TACeIcoUYxrTHB3i061x8/all29f
-yfoAnRoFjZOYs6MEPwgwlP3yYoFjmr7I
-=xHwL
------END PGP SIGNATURE-----
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch
new file mode 100644
index 000000000000..30947a82eb0a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch
@@ -0,0 +1,45 @@
+diff -ur ParaView3.orig/VTK/IO/vtkPNGReader.cxx ParaView3/VTK/IO/vtkPNGReader.cxx
+--- ParaView3.orig/VTK/IO/vtkPNGReader.cxx	2006-09-22 00:23:24.000000000 +0300
++++ ParaView3/VTK/IO/vtkPNGReader.cxx	2010-05-12 15:28:30.000000000 +0300
+@@ -116,7 +116,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
+@@ -225,7 +225,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
+diff -ur ParaView3.orig/VTK/Utilities/vtkpng/png.h ParaView3/VTK/Utilities/vtkpng/png.h
+--- ParaView3.orig/VTK/Utilities/vtkpng/png.h	2004-04-28 18:49:22.000000000 +0300
++++ ParaView3/VTK/Utilities/vtkpng/png.h	2010-05-12 15:28:00.000000000 +0300
+@@ -1330,7 +1330,7 @@
+ #if defined(PNG_READ_EXPAND_SUPPORTED)
+ /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
+ extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+-extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
++extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+ extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+ extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+ #endif
+diff -ur ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h
+--- ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h	2004-10-26 19:56:45.000000000 +0300
++++ ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h	2010-05-12 15:27:25.000000000 +0300
+@@ -229,7 +229,7 @@
+ #define png_set_gAMA vtk_png_set_gAMA
+ #define png_set_gAMA_fixed vtk_png_set_gAMA_fixed
+ #define png_set_gamma vtk_png_set_gamma
+-#define png_set_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8
++#define png_set_expand_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8
+ #define png_set_gray_to_rgb vtk_png_set_gray_to_rgb
+ #define png_set_hIST vtk_png_set_hIST
+ #define png_set_iCCP vtk_png_set_iCCP
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index 7fc1181a338a..062f3ad64386 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-2010 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.5 2010/03/09 12:10:25 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.6 2010/05/12 12:59:07 ssuominen Exp $
 
 EAPI="2"
 
@@ -70,6 +70,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-boost-property_map.patch
 	epatch "${FILESDIR}"/${P}-odbc.patch
 	epatch "${FILESDIR}"/${P}-h5part.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 
 	if has_version '>=sci-libs/hdf5-1.8.0'; then
 		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch