diff options
Diffstat (limited to 'games-simulation/cannonsmash')
| -rw-r--r-- | games-simulation/cannonsmash/ChangeLog | 6 | ||||
| -rw-r--r-- | games-simulation/cannonsmash/Manifest | 18 | ||||
| -rw-r--r-- | games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild | 5 | ||||
| -rw-r--r-- | games-simulation/cannonsmash/files/0.6.5-loadparts.patch | 15 | ||||
| -rw-r--r-- | games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch | 22 |
5 files changed, 39 insertions, 27 deletions
diff --git a/games-simulation/cannonsmash/ChangeLog b/games-simulation/cannonsmash/ChangeLog index 900d7de91001..81510bce86b2 100644 --- a/games-simulation/cannonsmash/ChangeLog +++ b/games-simulation/cannonsmash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-simulation/cannonsmash # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.13 2006/02/22 21:50:16 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.14 2006/04/10 22:47:50 tupone Exp $ + + 10 Apr 2006; <Tupone@gentoo.org> +files/cannonsmash-0.6.6-gcc41.patch, + -files/0.6.5-loadparts.patch, cannonsmash-0.6.6.ebuild: + gcc-4.1 fix 22 Feb 2006; <Tupone@gentoo.org> cannonsmash-0.6.6.ebuild: Modular X dependency fix diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest index 69f45a2f7843..4dd49c25e2ac 100644 --- a/games-simulation/cannonsmash/Manifest +++ b/games-simulation/cannonsmash/Manifest @@ -1,12 +1,12 @@ -MD5 eb7874cf7ab7bce721adf93e2e2a981a ChangeLog 2254 -RMD160 a010ca9558d5ac335b46afebfdc60dfaf58b91b1 ChangeLog 2254 -SHA256 143b4b137f437ba79b37f085170f15f62e56b9a231aa4cc6f25081db453cedd0 ChangeLog 2254 -MD5 d52ea12ad1283a0a9c17d2b492056ffe cannonsmash-0.6.6.ebuild 1448 -RMD160 66c3f5285ed73f318bae361e88d343f8dff63530 cannonsmash-0.6.6.ebuild 1448 -SHA256 415fa55665881736ce9f31338745cc6978e4d239aa9aae3613ed4d3323fdb840 cannonsmash-0.6.6.ebuild 1448 -MD5 2ca70e3856451ca1226bb3461a653895 files/0.6.5-loadparts.patch 348 -RMD160 5716c46612ad18a253d17d511df1a3f335e87c91 files/0.6.5-loadparts.patch 348 -SHA256 7d409f3c9e9f0112fbacd39e2a161a256eef9766f312d47df1ad24cd06ee383e files/0.6.5-loadparts.patch 348 +MD5 a86febbbe74f2e6d575524524bd16840 ChangeLog 2400 +RMD160 05f036c4a161eb8653670152e606939d7ac47d33 ChangeLog 2400 +SHA256 412d55d4b32b76de522617e24acc94fa097a4dfe664a9ef5aa9fcf48d265c409 ChangeLog 2400 +MD5 5bca4c1a71b4c5f32d8f0f4f1f5e3aa9 cannonsmash-0.6.6.ebuild 1483 +RMD160 d225d85b5f9203cb766a5cbb114911d12714cc5d cannonsmash-0.6.6.ebuild 1483 +SHA256 ca8c27bafa9c8f6b5f4981c6fb83c8c8bec80b8ed769ddf270ac1ae7aa1b1493 cannonsmash-0.6.6.ebuild 1483 +MD5 2ffbd16a7577ab027afa03466bff1ad6 files/cannonsmash-0.6.6-gcc41.patch 586 +RMD160 b32e17b299d5ee16f42132fe0561c0c6d658bc5a files/cannonsmash-0.6.6-gcc41.patch 586 +SHA256 8f8f53f8eb715984fd65409d178bc586e9610842a4f2a2a9249e3bf6adeacf62 files/cannonsmash-0.6.6-gcc41.patch 586 MD5 112758236b8f2e754e515d821380787e files/cannonsmash-0.6.6-sizeof-cast.patch 358 RMD160 e9d53d5d83ad316aacd1a826b229cd54d7824b45 files/cannonsmash-0.6.6-sizeof-cast.patch 358 SHA256 a896a7f05317080500663aa49a6f61642c41e690b5889095f1f193a82cd4cbe6 files/cannonsmash-0.6.6-sizeof-cast.patch 358 diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild index 031d32b564ba..821f399f2c6b 100644 --- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild +++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.10 2006/02/22 21:50:16 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.11 2006/04/10 22:47:52 tupone Exp $ inherit eutils games @@ -30,7 +30,8 @@ src_unpack() { cd "${S}" epatch \ "${FILESDIR}"/${P}-x-inc.patch \ - "${FILESDIR}"/${P}-sizeof-cast.patch + "${FILESDIR}"/${P}-sizeof-cast.patch \ + "${FILESDIR}"/${P}-gcc41.patch if use vorbis ; then cp "${DISTDIR}"/${MY_OGG} "${S}"/ || die "cp failed" sed -i \ diff --git a/games-simulation/cannonsmash/files/0.6.5-loadparts.patch b/games-simulation/cannonsmash/files/0.6.5-loadparts.patch deleted file mode 100644 index be5bf56aed32..000000000000 --- a/games-simulation/cannonsmash/files/0.6.5-loadparts.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- loadparts.cpp.orig 2003-03-09 20:35:34.000000000 -0500 -+++ loadparts.cpp 2003-03-09 20:35:48.000000000 -0500 -@@ -429,9 +429,9 @@ - ++i; - } - } -- if (!i) { -- printf("%d: %s is empty object\n", lineno, object->name); -- } -+// if (!i) { -+// printf("%d: %s is empty object\n", lineno, object->name); -+// } - return true; - } - diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch new file mode 100644 index 000000000000..0f3e511f09cc --- /dev/null +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch @@ -0,0 +1,22 @@ +--- BallView.h.old 2006-04-11 00:10:37.000000000 +0200 ++++ BallView.h 2006-04-11 00:10:53.000000000 +0200 +@@ -32,7 +32,7 @@ + + static GLuint m_number[10]; + private: +- void BallView::DrawTargetCircle(); ++ void DrawTargetCircle(); + GLUquadricObj *m_quad; + + void DrawBall(); +--- matrix.old 2006-04-11 00:13:18.000000000 +0200 ++++ matrix 2006-04-11 00:19:34.000000000 +0200 +@@ -42,7 +42,7 @@ + + /* __BEGIN__BEGIN__ */ + //__NAMESPACE_BEGIN(ese); +-#if (!defined __GNUG__) || (__GNUC__ == 3) ++#if (!defined __GNUG__) || (__GNUC__ >= 3) + template<typename T> + void swap(T& a, T& b) + { |