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

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

4 files changed, 27 insertions, 10 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index a309059159d6..d0e63ea38eb2 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/enigma
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.50 2011/04/29 06:55:25 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.51 2011/09/15 02:16:23 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> enigma-1.01.ebuild,
+  +files/enigma-1.01-libpng15.patch:
+  Fix building with libpng15 wrt #378391 by Diego Elio Pettenò
 
   29 Apr 2011; Tupone Alfredo <tupone@gentoo.org> enigma-1.01.ebuild,
   +files/enigma-1.01-gcc46.patch:
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 32770a487481..1d99a3a95154 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX enigma-1.01-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1
 AUX enigma-1.01-gcc43.patch 813 RMD160 27998358a70579aabbd476358ce6e262494a2ce5 SHA1 fabc6422e5bf9372179d23bc2da3fe9e280172b7 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897
 AUX enigma-1.01-gcc44.patch 1693 RMD160 afc2574ea9018ae4a109d86acf4075b6240df6c9 SHA1 832820b8441ec4c24e58b4f6bb460c06f02f730c SHA256 77b9fd58a843a21afb8c8769e562e86c5d7e5fcaf87067ef4dd91cbe09b207ff
 AUX enigma-1.01-gcc46.patch 548 RMD160 110028a59619f0f900dc8067be142db04c0ec46f SHA1 ed5f2945c101d15358558aab6e51ed4163b5b7a8 SHA256 712f8ffaf4e32c4603e8d977bc94feaadef7d5dfed62177ec9226e6cfe797a17
+AUX enigma-1.01-libpng15.patch 393 RMD160 b19eda92fc4736033ece603ce686452807d64519 SHA1 2d26ed636ff47a9cf32237fa0d5e3210e0408611 SHA256 1351bfa3518b79bfab3473dd44bc6256b05c52d0d24c0706f52356603ecfac09
 AUX enigma-1.01-xerces-c.patch 3824 RMD160 f58690c41dbf2d47b25523de8bd7a86de5f6627c SHA1 f64878363fedf54f1f6e186555f789a25e13f9cd SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f
 DIST enigma-1.01-64bit.tar.gz 10891095 RMD160 671971415e8d96bc84e2a823d66359025e158128 SHA1 2f9f5aaf3d233c248d818c3a2fd5ea873d34135f SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736
-EBUILD enigma-1.01.ebuild 1271 RMD160 3f3ce601b4c72c2935e35ba717d829786b80425d SHA1 714dd51b0c3660d3d2e1d1c5fb012a47863b81a9 SHA256 60b465fc541f0c8d5b78958d955cb3c3024cea346110bed311bac826a278c66d
-MISC ChangeLog 7615 RMD160 d8c27e61d2ce540c6dd1dfd13249f3b421c5f502 SHA1 99aace88011dbc5202be9847c105fd76c4f5d38b SHA256 b76e0be965d6264abda6cd66e84e4bd0110575d2d3f2c16fd60c56387c23b036
+EBUILD enigma-1.01.ebuild 1312 RMD160 7478f9a666180f6cc7f7da0803c14e6082e457b8 SHA1 0fcc51aec993c03f25acc2b4f921a2570215835d SHA256 0c0f742eccf706002a0ee155cdc9434f650163aca222826454c312517a2990d4
+MISC ChangeLog 7794 RMD160 f97bdf76910c0b1f2e993b7ee0785ca156e6527e SHA1 cade816008658a58739a85cbe496f29d102dd807 SHA256 3ca37e20e6def28f60322e361d8e5fe0efe5688da69cc7fbff964d13854a6a05
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk26YOcACgkQIY77eQFFFC3piACgv5KHEf3JIYmAyLIlq8MONm9b
-R9IAniNDtHbgq3kwFlfDsaACO1kbcwyr
-=Ha6m
+iF4EAREIAAYFAk5xYC8ACgkQXkR9YqOcLPHmMQEAoTF+spUzIpyGepdhl+PiqPDZ
+45ZedblnAbpi0YXrM0gBAJIXBP8HM8bV7Y99+DQs9e6hmM/2142D+5pQQAeOzOLm
+=rVlB
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/enigma/enigma-1.01.ebuild b/games-puzzle/enigma/enigma-1.01.ebuild
index 9faa90292ca9..44ccada8a3ec 100644
--- a/games-puzzle/enigma/enigma-1.01.ebuild
+++ b/games-puzzle/enigma/enigma-1.01.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/games-puzzle/enigma/enigma-1.01.ebuild,v 1.15 2011/04/29 06:55:25 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.16 2011/09/15 02:16:23 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -32,7 +32,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-xerces-c.patch
+		"${FILESDIR}"/${P}-xerces-c.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	eautoreconf
 }
 
diff --git a/games-puzzle/enigma/files/enigma-1.01-libpng15.patch b/games-puzzle/enigma/files/enigma-1.01-libpng15.patch
new file mode 100644
index 000000000000..a6ce342bd168
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.01-libpng15.patch
@@ -0,0 +1,11 @@
+--- lib-src/enigma-core/IMG_SavePNG.c
++++ lib-src/enigma-core/IMG_SavePNG.c
+@@ -84,7 +84,7 @@
+                 png_bytep *row_pointers = 0;
+ 
+                 /* Set error handling. */
+-                if (setjmp(png_ptr->jmpbuf)) {
++                if (setjmp(png_jmpbuf(png_ptr))) {
+                     IMG_SetError("Error writing the PNG file");
+                 }
+                 else {