Fix build with gcc-4.7 Bug #426870

Package-Manager: portage-2.1.11.7/cvs/Linux i686

4 files changed, 63 insertions, 5 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index 965be74c833d..abd3d2156288 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.55 2012/05/03 06:35:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.56 2012/07/17 12:33:39 tupone Exp $
+
+  17 Jul 2012; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.4.0.ebuild,
+  +files/crystalspace-1.4.0-gcc47.patch:
+  Fix build with gcc-4.7 Bug #426870 by flameeyes@gentoo.org
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> crystalspace-1.4.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index b171d7ed374d..dcc097da37ad 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX crystalspace-1.4.0-bullet.patch 501 SHA256 0dc5ecb64d9a9a07a3da9e89c51080952beb1a4daed40e6b3eccc64ab9e4677f SHA512 a325edafe6bebbe4679521763a1dcb70ef5caa9593f42486384ede2e6f98754354617e0064af8eaa746981a506b66483df501aa50178c7e9176ccbda21b0f5fb WHIRLPOOL c9e3d9cfa13f9f3699111075eb700cd49656d7bd80d297207c6e69fbd9076db72ef7193e0f37a4c50853842c57edd92710f7e40a1661b5b1ed77700376202169
+AUX crystalspace-1.4.0-gcc47.patch 1211 SHA256 816d4d19c916ce5ccfb198200d9b926948bb62de7e289fdad760faac7bcccd9a SHA512 a7e528041dc0d5d1f03bb6fca2850bc659ceef1ddf426dc29c3be546be83b555ebd35af3998bd977c1df5326fb9b6f630a5b766f126307d14ddb4ba1dcab6f96 WHIRLPOOL 9c6b24a6c82830a0c71d9d6318b7e84f26eebd26fc5103e82a1029e652dc198aa7c15d10f77aafbc742cb3e4726c478e22e16c18a32e51097e73209c6c702450
 AUX crystalspace-1.4.0-png15.patch 1695 SHA256 f755eb090ce0a3df558c9c126d3f30c834807a392c824b8e2eda696fd54a1017 SHA512 78dfc5886b5b3588e6203c0b58d1cbea5561b3cf4b0dff27ef778272c56d12908583b832c707ab4b49af96853703164f680041aaeb8954dfa1eda49f6cc97b65 WHIRLPOOL 2a92dd655b3a9571481ac56e7672a0cb0c3c514b166d53e09c112452c0772f226ac4f3de0d56499219e5f7ac79a671b9dc96c5b4e87c29b390a2dd3862209bb1
 DIST crystalspace-src-1.4.0.tar.bz2 45670477 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba SHA512 fd661f519723ad16c8fc9dc65fa8148b9c828c01b4b586618b9a58cf0c30aec1b7d70a37e61072a1d5f6121b1767647a3a0c06a5a2dd94f26e7b498366bdff55 WHIRLPOOL e9a9bf8fc2d4b4ad171c988706e34062ea4b0053c6dd68a3a417d44d1717dea50ec5d93bed37969738c852b78f5c8b4913f4b6ab1ba3b2ed9e3837f8f1d41aef
-EBUILD crystalspace-1.4.0.ebuild 3610 SHA256 16c4631bfc896bc6fef9a1d3d7757eb75121fd3303745d5b1b145c420ef0a47e SHA512 b71f8a99b77f69adaaa42dc643ef9ff6fb90077d29aa7a2dbc9680f3425f36b59a1e4543a475c3bb405818be3f127f32d3449a153f4691f0b6036b5420bab2d8 WHIRLPOOL da346ce082c93994ed8cb6bb83d6bfcd5a58164f14e1b7ae07b024111a7afd5dc164202c8548d90f05b5c61847af2925431d893d3a785a9ba42914b931d4cdaa
-MISC ChangeLog 8498 SHA256 5e0c755e1d7453bf23469e6cafb717f4de33c23fa6a61f24a15608435ed35bbd SHA512 3a40552c1545aa69d7b9bcca3c1d28fab82e11c5a796762797e7ed51d6d896720d963e1a416e42bf9a41cb41a3b5d6289f28e0d8453acad0b279247187deaf8a WHIRLPOOL 15370d9ae9d849b623831592d6a9a13912a113b5c8a0687fd8c8ff8ec650c834724fedb1d7cfe10ea88d56e95d3a394d173e7343cedc5bbbd57e6dc8d090bb9e
+EBUILD crystalspace-1.4.0.ebuild 3645 SHA256 c11fcf69fb5fdaa7c45a702a4a3d998b78f3fc1ee4fb27f5ca3f0edf1ca48979 SHA512 f43b18b9c4ba1a6b789c5b097614d980757ef759d3ed7db8c8dbb306043b82a41f0dc67e8ad6a503713119091955d68b9e4e900a7a02cb7dc5b632ca46efe3c1 WHIRLPOOL 1481fbf0025cb20b983e969dc8aa3408594c574abb3a0290fbd5ee2150052f79d7163f6cffe7e57a32ead1841a0c2924d363d5856732757016270bd91b6c31cc
+MISC ChangeLog 8678 SHA256 e6e6f84915ab8763891c047ef170d8923ca13dc66c1f054e8ae6f12bc04aaa15 SHA512 90ae1f8c8b656cc7eac5e17d5b50e4c7e7d7776bb2e7cebab4c9b8b8b5199eb623c3707718e642a52a9513c1e9a2e8227e6f9c3e30d552cdd17c47a0dd7170e5 WHIRLPOOL eef27cb43dae0a4860edf9ec777ca52ff19081255de18e5fe054ca353730e27508650968fc11ff57fdb67adcc735e881f367ba7c3fbc630ffa3b0a020795828e
 MISC metadata.xml 1309 SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283 SHA512 6314078e087224153cc83679bc592a6e39db1133228ff1ed045766a5004b45723d9ff01eff089007ae1f5279c1539883b0ecbf7e75ccb298ce45882a0f56512d WHIRLPOOL 816ed43eb53fcf7035bc152211d6337406e3293256c90f35ccd4808c6fdb09147d25ebae0bf507334521e08093383e1c930ec60c5678a09cdcd9093aa5c7c880
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAFW68ACgkQIY77eQFFFC0JJQCgkAnhetL88jVPc89Bi7/X+yYp
+GQUAnAmEZXnv/pyAFh+9lhkb/DSqBuJM
+=sBk8
+-----END PGP SIGNATURE-----
diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
index 9fea9d7e6813..c838c9521bcb 100644
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.10 2012/05/03 06:35:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.11 2012/07/17 12:33:39 tupone Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator
@@ -60,7 +60,8 @@ src_prepare() {
 		docs/Jamfile \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-bullet.patch \
-		"${FILESDIR}"/${P}-png15.patch
+		"${FILESDIR}"/${P}-png15.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 	AT_M4DIR=mk/autoconf
 	eautoreconf
 }
diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
new file mode 100644
index 000000000000..74ac5df38296
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
@@ -0,0 +1,42 @@
+--- include/csutil/blockallocator.h.old	2012-07-17 09:08:57.203478402 +0200
++++ include/csutil/blockallocator.h	2012-07-17 09:10:34.556642885 +0200
+@@ -166,7 +166,7 @@
+   ~csBlockAllocator()
+   {
+     ObjectDispose dispose (*this, false);
+-    DisposeAll (dispose);
++    this->DisposeAll (dispose);
+   }
+ 
+   /**
+@@ -177,7 +177,7 @@
+   void Empty()
+   {
+     ObjectDispose dispose (*this, true);
+-    DisposeAll (dispose);
++    this->DisposeAll (dispose);
+   }
+ 
+   /**
+--- include/csutil/parray.h.old	2012-07-17 13:02:11.524886456 +0200
++++ include/csutil/parray.h	2012-07-17 13:02:43.531639147 +0200
+@@ -106,7 +106,7 @@
+   {
+     CS_ASSERT (this->GetSize () > 0);
+     T* ret = GetAndClear (this->GetSize () - 1); // see *1*
+-    Truncate (this->GetSize () - 1);
++    this->Truncate (this->GetSize () - 1);
+     return ret;
+   }
+ 
+--- include/csutil/refarr.h.old	2012-07-17 09:16:33.084469347 +0200
++++ include/csutil/refarr.h	2012-07-17 09:17:04.008298074 +0200
+@@ -106,7 +106,7 @@
+   {
+     CS_ASSERT (this->GetSize () > 0);
+     csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
+-    SetSize (this->GetSize () - 1);
++    this->SetSize (this->GetSize () - 1);
+     return csPtr<T> (ret);
+   }
+ };