Fix building with libpng14.

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

5 files changed, 28 insertions, 7 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 5aba7c2802e5..d413c80a8238 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.39 2010/02/22 12:40:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.40 2010/03/09 06:06:32 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  crystalspace-1.2.1.ebuild, +files/crystalspace-1.2.1-libpng14.patch:
+  Fix building with libpng14.
 
   22 Feb 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.0.1.ebuild,
   crystalspace-1.2.1.ebuild:
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 36170f3d6a91..04b54b527484 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,6 +1,7 @@
+AUX crystalspace-1.2.1-libpng14.patch 536 RMD160 08312ba84933366d5b56926329dfb1af1c0e65ec SHA1 59a00a12a4ef642f3c02b3fae41166b0c9a2963c SHA256 e8dc73cab522a0e9200d41be28174f846c809e1363836f478ed8159c426a6399
 DIST crystalspace-src-1.0.1.tar.bz2 36581454 RMD160 e9cca632623fbc487bb39a8c088fa93aa78e23d4 SHA1 457958e4cc7d96272157e1c8be7a816620051714 SHA256 3042b1fdc5b4ac23c7a4799df232a8e2134fd215448e0785180759ebba7f9ab2
 DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10
 EBUILD crystalspace-1.0.1.ebuild 3464 RMD160 ad115a160b24cdfe1bfaabd106b31287dc88bd30 SHA1 71bb8bf38632c8e527881f1384f5240e59216716 SHA256 ca308d59837cf400184204b464b76f917bee8abbf6ab319fb48ada9eb6c5ce09
-EBUILD crystalspace-1.2.1.ebuild 3350 RMD160 440872d3f6961943a88248863deef86a98237bf5 SHA1 ea4a1b66c6af0f4346817f803448804c4e315ccc SHA256 f2cf95cc2d4a7b1d6d11ec83753457b4898feb0501c6dfa544f3d2ecc1afe196
-MISC ChangeLog 6173 RMD160 7c10607f067a3aa49bbd9c72017f89f970493387 SHA1 9c85240412345cb36e8fe3dc414735383325cd6e SHA256 51eb74f0980d14e0061fcb4d1d2cbc492e104bf5df30e9b69c10f58248b2a5d2
+EBUILD crystalspace-1.2.1.ebuild 3403 RMD160 63e9d1b2c61f6c4ac94d671c3ed1cca3b1a30f3f SHA1 b7cddf942433521787478e6b6c1feea09113d5db SHA256 daa366f660aab30094f848a5b1661e8404aeaafffc3d69cb65286da7fdf4229e
+MISC ChangeLog 6332 RMD160 506b4c54dd43fc3abf89ea290cb48098a5751c94 SHA1 f30c959d2f9dc257183f8468776ca2c613ea68de SHA256 da22173ad4330fb8c797284a4d0b6ba2e090a2ef6b3497dad73c1e66e0cf34f0
 MISC metadata.xml 1243 RMD160 1f23863f3940b9349b19a701d80f0888cc7b2242 SHA1 71931e463e50c1ab0af385a3c4d10d6ad5ed960a SHA256 f7125504551e256f5ceb9385b20e945f3717a1cda3dcf6f3ff5e9f88850025b0
diff --git a/dev-games/crystalspace/crystalspace-1.2.1.ebuild b/dev-games/crystalspace/crystalspace-1.2.1.ebuild
index 833602b5f327..61fc607a0649 100644
--- a/dev-games/crystalspace/crystalspace-1.2.1.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.1.ebuild,v 1.2 2010/02/22 12:40:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.1.ebuild,v 1.3 2010/03/09 06:06:32 ssuominen Exp $
 
 EAPI=2
-inherit flag-o-matic multilib wxwidgets
+inherit eutils flag-o-matic multilib wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="Portable 3D Game Development Kit written in C++"
@@ -51,6 +51,8 @@ src_prepare() {
 		Jamfile.in \
 		docs/Jamfile \
 		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {
diff --git a/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch b/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch
new file mode 100644
index 000000000000..cb7998115a5b
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch
@@ -0,0 +1,14 @@
+http://permalink.gmane.org/gmane.comp.graphics.crystalspace.tracker/5630
+http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+
+--- plugins/video/loader/png/pngimage.cpp
++++ plugins/video/loader/png/pngimage.cpp
+@@ -378,7 +378,7 @@
+   const png_bytep iBuffer = dataSource->GetUint8();
+   const size_t iSize = dataSource->GetSize();
+ 
+-  if (!png_check_sig (iBuffer, (int)iSize))
++  if (png_sig_cmp (iBuffer, 0, (int)iSize))
+     return false;
+   png = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+   if (!png)
diff --git a/dev-games/gtkradiant/Manifest b/dev-games/gtkradiant/Manifest
index cbbb4c4cadc7..3195fd15c8ea 100644
--- a/dev-games/gtkradiant/Manifest
+++ b/dev-games/gtkradiant/Manifest
@@ -5,6 +5,6 @@ AUX q3map2 136 RMD160 5c12be830152a25ebdc9a3deeef6c36ed57a1bd0 SHA1 d4d77c3d7614
 AUX radiant 137 RMD160 6feda529991764a189b21f1530e0acfc2475074e SHA1 b3e800d67e65a9948660c26decdfeb309477707f SHA256 866ed2c67ea3e7fc515986ab69635e1a0ef783bcba4d4d618e05c4832e92fb68
 AUX wolf.game 318 RMD160 876004701ac984d2c488b4049e9624cde501cc84 SHA1 3b7ea052ab95c5b025d714fa42e607f796e2b52c SHA256 2527634e3c7a0fe633f14c6dd40118902cee998e0da90cd1652c972c7ce692f4
 DIST gtkradiant-1.5.0-2006-03-02.i386.rpm 3130735 RMD160 15a1044d4a1a5672b810cf55e106c979c4af7b5e SHA1 a89d59669fe7abb40f5793cf73417a443e2e0767 SHA256 339c9c1f86f0b3a033b6c41426c2b893f42d87f192291107e4939750c8bc0069
-EBUILD gtkradiant-1.5.0_pre20060302.ebuild 1000 RMD160 89a08919e982f41e827feeb9b8b148c7c41c401e SHA1 c21cc13e4f87272781ae540676119d45c905912e SHA256 5e1b54037441d552dc7bef3a288ed559aa74cdfb062780c45ab54f4473b245d0
-MISC ChangeLog 2067 RMD160 488640ed95d893a178443bcde820183c350453d6 SHA1 24d756ddbf438c960625994d01bbbbc6403d59fd SHA256 2fd9b295916a99b3ad84c8e4f00ca3554b9a2c27af5dae94fad7935835102f76
+EBUILD gtkradiant-1.5.0_pre20060302.ebuild 1006 RMD160 b617c9527a1aace20d4d03f369398833112f0d3c SHA1 fd09ab8c89dec80b4e524e42f4dd80a41b9ae636 SHA256 cecd5b52059d50e293ac5e57024ee4d208ea0057d2be5e306479effe88b8890a
+MISC ChangeLog 2204 RMD160 ae861c8b77b61e79f08627975c412f38f141bff2 SHA1 5997576b6622b68ca75e1eb38902a27fd64c2db5 SHA256 621412fb04bb848cef79638edd6944ea92bcf7ba39cb56e31f00db769c542f20
 MISC metadata.xml 446 RMD160 4303eff5373bb0cd9cf7ec3a12de1b49f7cefb43 SHA1 c73517bae49b44824c3da8362b2803b1b3af9189 SHA256 1c92d78dce6239046b65724906a709934035064818776e0b1c54eea20961bb50