Fix build with gcc-4.5 Bug #320477

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

diff --git a/games-server/cyphesis/ChangeLog b/games-server/cyphesis/ChangeLog
index d519335b68fcc573443ba93c9b979cf49e6c8361..e9d62a1cfb6365c7075dca8c6edaf344820d8b99 100644 (file)
--- a/games-server/cyphesis/ChangeLog
+++ b/games-server/cyphesis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/cyphesis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.10 2009/12/16 06:00:50 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/ChangeLog,v 1.11 2010/05/19 14:40:56 tupone Exp $
+
+  19 May 2010; Tupone Alfredo <tupone@gentoo.org> cyphesis-0.5.22.ebuild,
+  +files/cyphesis-0.5.22-gcc45.patch:
+  Fix build with gcc-4.5 Bug #320477 by flameeyes@gentoo.org
 
 *cyphesis-0.5.22 (16 Dec 2009)
 

diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
index 6b92b0f1518fc15eaa61220b18bd3ca0048c1850..a3eba5c91f8c70adf2498e5f30da93aa953b25dc 100644 (file)
--- a/games-server/cyphesis/Manifest
+++ b/games-server/cyphesis/Manifest
@@ -1,5 +1,6 @@
+AUX cyphesis-0.5.22-gcc45.patch 251 RMD160 1c423b83ad4ed28b2f56a5617a70805ad35282fd SHA1 5762cbb959812559ec7e6d44b2dcaf2feb744b6c SHA256 1c81d0642f92690e468832d7053b335bf4188ca397b66202a5ae167f39da174d
 AUX cyphesis-0.5.22-gentoo.patch 1437 RMD160 f649904d186a2b224e46a50c78a6d29bb7bbdb57 SHA1 4843375ad98e69bd6436244a4438fb4561090e14 SHA256 95f508f9e58a7339107e1fc5c433345a6ffb00372d0b2c4ceaa7fb2f15b99598
 DIST cyphesis-0.5.22.tar.bz2 642305 RMD160 dec62eb6a8617fdbf629e67aefa0d374579a9173 SHA1 b7c42009fecc3048aadee4db6432c699b66c16f9 SHA256 6a31896b1c4ecc8b50c5546681c42b2c4804a5032917dbf2b520032925574a36
-EBUILD cyphesis-0.5.22.ebuild 1125 RMD160 74fb0fe95a7278517632ce50fbcb463b157fa893 SHA1 7bcda6aabc53134f97b51db9af3243281f6159e0 SHA256 6c1537f068203eb0b8c53a2e0f8d1807956fb0a0020d8e1c3b026de5f5d257b4
-MISC ChangeLog 2040 RMD160 0d99a53d1cbd62be9a8ae56271e453fd999b168e SHA1 8eeb25ce367f00ec288fd47b5457eeae6d161847 SHA256 2eb5dcf5766c3c7a669c91eed89eafc1c3333b7012e5a60f52e8b8869668a1cf
+EBUILD cyphesis-0.5.22.ebuild 1157 RMD160 9fe07be0808ae446c1432c177ebd9ee86e0d5d48 SHA1 92c82966e4f17d7d006b00625952787e11715a3f SHA256 2b419de95b7e013e17e980091bffbe40fea6064225606ceeac8fd9ea957666cc
+MISC ChangeLog 2211 RMD160 2d0735c5d88e708633ad67ba7c298f0d66a3d2e2 SHA1 c093f904689bf9cdd845aca2747ee6e849f3cd57 SHA256 7879d4fc75664b5d966d6713ec04213119bebe8e494f6a02d4c6e4aa2d72a9c7
 MISC metadata.xml 658 RMD160 861bab297e9ffd8300f2be238803295eecf6bc88 SHA1 06123a6a79c71384cad174b66ba798dee92ac99f SHA256 7abce09650fe6062c27ee350f8ac2578ba482cdc2b1c4970dc4cd4f076e24028

diff --git a/games-server/cyphesis/cyphesis-0.5.22.ebuild b/games-server/cyphesis/cyphesis-0.5.22.ebuild
index e43038e3a6992ccbfacd30b4ee541e3b3197b5e2..d49228ce3d76fc14664696dbd96515b2b748ea55 100644 (file)
--- a/games-server/cyphesis/cyphesis-0.5.22.ebuild
+++ b/games-server/cyphesis/cyphesis-0.5.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.22.ebuild,v 1.1 2009/12/16 06:00:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.22.ebuild,v 1.2 2010/05/19 14:40:56 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-gentoo.patch
+       epatch "${FILESDIR}"/${P}-gentoo.patch \
+               "${FILESDIR}"/${P}-gcc45.patch
        eautoreconf
 }
 

diff --git a/games-server/cyphesis/files/cyphesis-0.5.22-gcc45.patch b/games-server/cyphesis/files/cyphesis-0.5.22-gcc45.patch
new file mode 100644 (file)
index 0000000..7e5c33d
--- /dev/null
+++ b/games-server/cyphesis/files/cyphesis-0.5.22-gcc45.patch
@@ -0,0 +1,10 @@
+--- physics/Collision.h.old    2010-05-19 14:31:30.000000000 +0200
++++ physics/Collision.h        2010-05-19 14:31:44.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "physics/Vector3D.h"
+ 
++#include <wfmath/point.h>
+ #include <wfmath/axisbox.h>
+ 
+ #include <map>