Fix building with libpng15 wrt #378393 by Diego Elio Pettenò

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

4 files changed, 38 insertions, 10 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index ed734d3bf4a3..c7faaf61ef40 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.87 2011/08/04 19:25:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.88 2011/09/13 12:51:10 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vtk-5.6.1.ebuild,
+  +files/vtk-5.6.1-libpng15.patch:
+  Fix building with libpng15 wrt #378393 by Diego Elio Pettenò
 
   04 Aug 2011; Fabian Groffen <grobian@gentoo.org> vtk-5.6.1.ebuild:
   Allow to find Python from Prefix, bug #376917
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index fee59d6d8339..fde927bee2e6 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
 AUX vtk-5.4.2-boost-property_map.patch 7739 RMD160 98e9bc2431264ad5692b73dc05e54afa697e4108 SHA1 f38f98e9e28a51bb0553b5792cdde39a2c319b3d SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119
@@ -13,6 +13,7 @@ AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29
 AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25
 AUX vtk-5.6.1-ffmpeg.patch 1230 RMD160 edfdd3aade2b5dc22db159ae4f111125546558d3 SHA1 54caa2517794f5bbaf82dbad07c41552c78ef062 SHA256 c505c9b1f30277e1b069dbd926dec0a48a9a2e2dad66f91102bfb152eeec78dc
 AUX vtk-5.6.1-gcc-46.patch 914 RMD160 89448f0dbb4c88cdc1dceb32c79085fde6c2dcd9 SHA1 16e8c5e4c85c4414dcfe816f4c1e61ff5945ceea SHA256 236186b47af0fa2e9fd0e96f815229d11a6c8c44bf2840a5f529ec6e49d7731c
+AUX vtk-5.6.1-libpng15.patch 686 RMD160 475a8a1c02c48950e268ae6a316948f7acd6e95c SHA1 98400b7caabb69ad96dcc80fa13fd5c3bb2bf478 SHA256 4d651b007b91882b676172e069a4d86479045a1087eba062212f787509d1a88e
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e
 DIST vtk-5.6.1.tar.gz 20780311 RMD160 ac1864c9604d843ab9c654c67109f4f1487acaee SHA1 6d4d0de3b468828f21f70c5af5e37f9412ee59c5 SHA256 007be00bae6c7c96f78ca9709516c993a4e3221d0b1762a7fe70e2abe407e86d
@@ -25,13 +26,13 @@ DIST vtkdata-5.6.1.tar.gz 77991728 RMD160 b77b5f6919beae406712b93cd333dd4fad5ff3
 EBUILD vtk-5.4.2-r1.ebuild 6379 RMD160 f796f2c974ca58fe7b34b62057d832e76950e6d8 SHA1 46c2fbe8ef5730744bb655e042661810e942d9f5 SHA256 966efe98dc9a1a48fd3faab5e1e0ec4eae636d45773f2f7bd49f455a4e30474d
 EBUILD vtk-5.6.0-r2.ebuild 7196 RMD160 c0e5497c113fffc6dc5ae543042f0abc0dd75cd0 SHA1 afb0f9565798ead6306f1a0a8e6ff955676de804 SHA256 9ebd57afe34faa0a5f1d9a9848cc88a22d1778eb526e68cfff385b8bc68bb7ee
 EBUILD vtk-5.6.0-r3.ebuild 7032 RMD160 1ab1e048e4472dcbb1a31a1f54ec1e5c8838aaae SHA1 0c1727eb6d5980cce1dbf4954eed6f6a80a615ff SHA256 ca7feddd527f9d8643ddb422ee112ece0507a5ba1b44eaef70d838cd5e96f174
-EBUILD vtk-5.6.1.ebuild 7080 RMD160 010e54d821bbc86bc1c6f5ec44bb9a90f5617c1e SHA1 d0fc1b6d40350cbb60bfa42ed3703aa4b6884a7c SHA256 e572580c6071a7c320ac7c5916fcf73b1a48dd08531ece4df69f858428f7b6de
-MISC ChangeLog 14718 RMD160 c0a3e5841acb6e13764ff18ccaea43d7fe7ad6c6 SHA1 04d0c950bef4f60d212dd8624f73b436a7495e70 SHA256 3ae55eaa0a27f642d17c7094f0c7dfc77d7df1bc350e88763309b309188c5ae7
+EBUILD vtk-5.6.1.ebuild 7120 RMD160 d71075b76d4156d895c4cfde682a00284a6d8f1c SHA1 9d14bde4ee332febc8f907d6c98468af0cdab054 SHA256 5c412a3adcccb9e8f6919ea2a0a207304f169b63499ec20f37e4aba8420d39ad
+MISC ChangeLog 14892 RMD160 5a911da85cd67375332e7a7596857856da139430 SHA1 a32766c671ab64b67f7dd2085b552fd50e1e3339 SHA256 703f5b31718c8d0d0572a8590e7ea633481ee2bed515144aa0f38d248f5e9287
 MISC metadata.xml 479 RMD160 dc6cec04eacde4d39c022bfec517773b2f19da0d SHA1 cdfce8db7bf37f6770cebd95df56ee81afe41d22 SHA256 7957d86eb3506ad56885d75cbec7235e2cb66b5733dffe666b6b545e2d05d443
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk468joACgkQX3X2B8XHTonDjgCfRrdvUQZMvErZH6DEac+MQNQl
-uk4An2z+c8+XdqPtSWZR/EFpQW4D7I9K
-=lJYU
+iF4EAREIAAYFAk5vUfMACgkQXkR9YqOcLPHHJwD/WpBGQUq/NanHn3dmZdLQY+ZS
+bwmmoVJXw+/t0xdEGNkA/jnafeCJKVdCOUz6/48q02Iywz30K8v9GWxoJkklSLAG
+=7Q7R
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch
new file mode 100644
index 000000000000..5bb5cbfb8cd6
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/378393
+
+--- VTK/IO/vtkPNGWriter.cxx
++++ VTK/IO/vtkPNGWriter.cxx
+@@ -147,7 +147,7 @@
+   void vtkPNGWriteErrorFunction(png_structp png_ptr,
+                                 png_const_charp vtkNotUsed(error_msg))
+   {
+-    longjmp(png_ptr->jmpbuf, 1);
++    longjmp(png_jmpbuf(png_ptr), 1);
+   }
+ }
+ 
+@@ -223,7 +223,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);
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index 10bc97d7fff5..656c28ac5406 100644
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.1.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-libs/vtk/vtk-5.6.1.ebuild,v 1.4 2011/08/04 19:25:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.1.ebuild,v 1.5 2011/09/13 12:51:10 ssuominen Exp $
 
 EAPI="3"
 
@@ -83,7 +83,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.6.0-R.patch \
 		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
 		"${FILESDIR}"/${P}-ffmpeg.patch \
-		"${FILESDIR}"/${P}-gcc-46.patch
+		"${FILESDIR}"/${P}-gcc-46.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 
 	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
 	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \