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

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

4 files changed, 36 insertions, 10 deletions

diff --git a/sci-physics/lightspeed/ChangeLog b/sci-physics/lightspeed/ChangeLog
index e6bb8af7ce90..04f993197c64 100644
--- a/sci-physics/lightspeed/ChangeLog
+++ b/sci-physics/lightspeed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/lightspeed
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.17 2011/04/07 18:37:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.18 2011/09/14 18:51:32 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  lightspeed-1.2a-r1.ebuild, +files/lightspeed-1.2a-libpng15.patch:
+  Fix building with libpng15 wrt #378397 by Diego Elio Pettenò
 
   07 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org>
   lightspeed-1.2a-r1.ebuild, +files/lightspeed-1.2a-autoconf.patch:
diff --git a/sci-physics/lightspeed/Manifest b/sci-physics/lightspeed/Manifest
index 1de2c0dd99f4..26381abf41a9 100644
--- a/sci-physics/lightspeed/Manifest
+++ b/sci-physics/lightspeed/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lightspeed-1.2a-autoconf.patch 592 RMD160 0f43123b22d4ba56146b8178a32a0ba28170781e SHA1 a25f52aba6ee865b584ed8df33a64565f50a7f84 SHA256 035dba75084fcc884146fe7e60e226d6f5daa2b63e3a1ece9d6ee79f45ca4e69
+AUX lightspeed-1.2a-libpng15.patch 575 RMD160 a39ee866e4f44cda1160c3468472fe4993b8d184 SHA1 bd794880aa463166abb3ffbbde3bb62f658325c5 SHA256 52509152261e8d21c30ffbdd082186b14ddf33071ac315d67f78f150d1d790f2
 DIST lightspeed-1.2a.tar.gz 163764 RMD160 8d52ec115db8d27ebe501df7fff11447750d1f6e SHA1 767ac436fa8b93cf8937045e336b555d91e3bdef SHA256 a8752acce625436b699b4d3c1ab479bd4116673784f17e527a3e37374abc4f4b
 DIST lightspeed_1.2a-7.diff.gz 379281 RMD160 1713bff69c3cbf19a4d80ae1025834f2c6f5f93b SHA1 bf4cbfce1eed74efc5bdf0f3d246fa57225d2056 SHA256 1cbc562d1ad10afb9598510537cd64fdbbb1f9bd12ac27c5180a668bbc548a58
 DIST objects-1.tar.gz 767805 RMD160 874b6f72a4e94789df62d40e63d89aeb0741d71b SHA1 9bf2d48cfce77d7f2c882ce341b38a09daef8cb4 SHA256 dd82324796b9f114c652220d069b131321a129ea41ef99cc0b8cbdf8c666bf5b
-EBUILD lightspeed-1.2a-r1.ebuild 1777 RMD160 44b152766bacb9b5aa53997437856a0a002b195b SHA1 96d19d0420e6e5b46ce6153df358596007e04793 SHA256 76942adec2a1dfb245b418c3977dcc02f5cdb58759aabd76a2ee4fe66981e4f7
-MISC ChangeLog 3133 RMD160 f424c6404001504e16f20ccbae5c8f5c98e7d34c SHA1 c7e7b8c87589084a134b45c30d4220dc29024521 SHA256 da779c4082ee8f98f41dc8431ea68626839abd4ef67bd5f6c6a75c90c2e897b3
+EBUILD lightspeed-1.2a-r1.ebuild 1820 RMD160 4f72d5f4deeb20b9b96adc980cba4e7c26bdb4f5 SHA1 311cbbfc0b1ce80bee6c0b651f65446efa4a932d SHA256 8d3f937587811ce3eaed03add40e9f476aff80ab8906e38e208a2f5b1398aaa9
+MISC ChangeLog 3321 RMD160 7c2f467b29297d57dd85d00ada6c0ece03c2df31 SHA1 e0e06cba45762661dc6f98438b6f7118d81c452e SHA256 708dc167f79ba6165bb186411dd3813cb4d8ee02bac53614cf031afb9a03b7a9
 MISC metadata.xml 574 RMD160 791e0a30267ad4a83fcd69b74105f213cb2163e1 SHA1 244bfeaf9c3c6d20f46863daeb0a0d36447a0187 SHA256 d516b42c066a9178bd30efc879c12d371dd8fdaa54dcf83ecf8a58c8d6dcb0dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2eBGUACgkQ1ycZbhPLE2Cl+QCgq5qy+isH6Qy+heX44r0iWB9D
-XrkAmwb9GLrQx7opwDWWWeH6RWrhmrqk
-=CdgU
+iF4EAREIAAYFAk5w9+sACgkQXkR9YqOcLPFpXwD/QlKCzE7wKuvzw9JccSqa7eXU
+LRXLuKU/OT6QBXpDpQoA/282OXItsBlCqfDFsGMD1zFy7PRZZurfUlMFWmv1c9+B
+=UVS6
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch b/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch
new file mode 100644
index 000000000000..c3909a7b4dac
--- /dev/null
+++ b/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch
@@ -0,0 +1,19 @@
+--- src/snapshot.c
++++ src/snapshot.c
+@@ -26,6 +26,7 @@
+ #include "lightspeed.h"
+ 
+ #ifdef HAVE_LIBPNG
++#include <zlib.h>
+ #include <png.h>
+ static int write_png( int message, const void *data );
+ #endif
+@@ -305,7 +306,7 @@
+ 			return -1;
+ 		png_write_s = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+ 		png_info_s = png_create_info_struct( png_write_s );
+-		if (setjmp( png_write_s->jmpbuf )) {
++		if (setjmp( png_jmpbuf( png_write_s ) )) {
+ 			/* Error writing file */
+ 			png_destroy_write_struct( &png_write_s, &png_info_s );
+ 			fclose( png_fp );
diff --git a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
index 4ea83e1f16ab..3a36357ad843 100644
--- a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
+++ b/sci-physics/lightspeed/lightspeed-1.2a-r1.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-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.12 2011/04/07 18:37:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.13 2011/09/14 18:51:32 ssuominen Exp $
 
 EAPI=2
 
@@ -40,7 +40,9 @@ S2="${WORKDIR}/objects"
 
 src_prepare() {
 	epatch "${WORKDIR}/${DEB_PATCH}.diff"
-	epatch "${FILESDIR}"/${P}-autoconf.patch
+	epatch \
+		"${FILESDIR}"/${P}-autoconf.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	eautoreconf
 }