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

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

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index e7d1fd143961fc22dbcc8d372d99fe74a9706a18..fb88b0cee4ef57bbb9c2a14af41d7869cf344a91 100644 (file)
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.48 2011/02/25 18:24:23 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.49 2011/09/15 02:31:01 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> clanlib-0.8.1.ebuild,
+  +files/clanlib-0.8.1-libpng15.patch:
+  Fix building with libpng15 wrt #378203 by Diego Elio Pettenò
 
   25 Feb 2011; Kevin McCarthy <signals@gentoo.org> clanlib-0.8.1.ebuild:
   Update depends from media-libs/jpeg to virtual/jpeg

diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 53401eef5bf6096cfb5ee720cdcd64df9809bff3..88465e1f81fd76d06197a9d93e9948017f5bef16 100644 (file)
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clanlib-0.8.1-gcc43.patch 605 RMD160 939a1dd266d570b340e625cc89186fbbedd85773 SHA1 4c21d82abbbecec432db51cfe87315231c5212c4 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320
 AUX clanlib-0.8.1-gcc44.patch 1523 RMD160 e48308b599927ded6cbb49a6ec951ba430ddf775 SHA1 c3ae9bd2a6fb0a33402223e4ede26ff2c5f51abb SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979
+AUX clanlib-0.8.1-libpng15.patch 377 RMD160 4e0b48c5e2684451b3f11b5b73ded7f4a95e02a0 SHA1 d6c9eeb122600e616d5aec3f6057c7fecb3e9f59 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342
 AUX clanlib-0.8.1-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
 DIST ClanLib-0.8.1.tgz 7629019 RMD160 b4a48861dc5a133052d2acec5172c9291cff2b91 SHA1 5999b9c882efcaf06fd007bb69e659e322b8e155 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495
-EBUILD clanlib-0.8.1.ebuild 2206 RMD160 a5d58f3aa131aa936fe37642f59a6525062875d4 SHA1 9e68fcb440fc20f74a55ca43190deb2dafbbbf08 SHA256 4e6eb3903298e8ee7abf4902169a2a9f576612883b661833ab9b2b2784468e4e
-MISC ChangeLog 9721 RMD160 6de94085d2ceab19829928db7f6d2646ef04c954 SHA1 9dc586767dc67faba5c1128d4a673431b4e2066e SHA256 0b231c1e89b724f2d32e2c8b5731ab08c53c8b875e78d3c6a90f084ff935dd8b
+EBUILD clanlib-0.8.1.ebuild 2246 RMD160 b760ef95c45655c86360b88003ce31130e42a3d4 SHA1 2a12170ae36cc399ffa762b82cac1d0cf9cf0f0b SHA256 e7dcced370677dde63f0fcae9686e889a2c3d77d983234e025bc00edbacd0e42
+MISC ChangeLog 9903 RMD160 771749f8afbc94da847f993838a6dce960f6a469 SHA1 8d05734eb1a438f955f78e3d1081907f9962e266 SHA256 ef56e27b46291eecdcea32240c1fd3cb5935dc31771fca0d152f3b1f3f21f044
 MISC metadata.xml 2920 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 SHA1 7b05a6cdc831e23c0679217a14e739acdea504b9 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5xY5wACgkQXkR9YqOcLPEnNgEAkAq2FWbKCZ12M2uoUR9V45Zo
+DCjDpqRzCMeAz2BhJIwBAKAEhGraxV/oPT52sfy7AfyyO2BnkbCJKjNM1T7jPMcm
+=eyOy
+-----END PGP SIGNATURE-----

diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
index 73c241c1ef8ca40c7d6655c89145402c67fa6267..7607642819ec5d0e7c80381703e37cdbda6c401d 100644 (file)
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.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/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.8 2011/02/25 18:24:23 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.9 2011/09/15 02:31:01 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic eutils
@@ -38,7 +38,8 @@ src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-ndebug.patch \
                "${FILESDIR}"/${P}-gcc43.patch \
-               "${FILESDIR}"/${P}-gcc44.patch
+               "${FILESDIR}"/${P}-gcc44.patch \
+               "${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_configure() {

diff --git a/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch
new file mode 100644 (file)
index 0000000..03d0ba5
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- Sources/Display/Providers/png_provider_generic.cpp
++++ Sources/Display/Providers/png_provider_generic.cpp
+@@ -107,7 +107,7 @@
+               png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+               cl_assert(false);
+       }   
+-      if (setjmp(png_ptr->jmpbuf))
++      if (setjmp(png_jmpbuf(png_ptr)))
+       {
+               png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+               cl_assert(false);