diff options
author | Jan Brinkmann <luckyduck@gentoo.org> | 2005-06-05 16:27:11 +0000 |
---|---|---|
committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-06-05 16:27:11 +0000 |
commit | a18a8131d067ea52a4e057e6b86aa3cf4dfad396 (patch) | |
tree | ed5d6fb0827f444f89c85a79f6cb0d6bfddc46f8 /games-puzzle/shaaft | |
parent | oops, src_compile should be src_install (diff) | |
download | gentoo-2-a18a8131d067ea52a4e057e6b86aa3cf4dfad396.tar.gz gentoo-2-a18a8131d067ea52a4e057e6b86aa3cf4dfad396.tar.bz2 gentoo-2-a18a8131d067ea52a4e057e6b86aa3cf4dfad396.zip |
Added patch to enable compilation with a 3.4.x gcc/g++, fixes #94301.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'games-puzzle/shaaft')
-rw-r--r-- | games-puzzle/shaaft/ChangeLog | 8 | ||||
-rw-r--r-- | games-puzzle/shaaft/Manifest | 5 | ||||
-rw-r--r-- | games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch | 19 | ||||
-rw-r--r-- | games-puzzle/shaaft/shaaft-0.5.0.ebuild | 8 |
4 files changed, 33 insertions, 7 deletions
diff --git a/games-puzzle/shaaft/ChangeLog b/games-puzzle/shaaft/ChangeLog index d7f6bd080fa9..2a54fb66448a 100644 --- a/games-puzzle/shaaft/ChangeLog +++ b/games-puzzle/shaaft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/shaaft -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.2 2004/06/24 23:09:40 agriffis Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.3 2005/06/05 16:27:11 luckyduck Exp $ + + 05 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> + +files/shaaft-0.5.0-gcc34.patch, shaaft-0.5.0.ebuild: + Added patch to enable compilation with a 3.4.x gcc/g++, fixes #94301. *shaaft-0.5.0 (01 Feb 2004) diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest index 3ab5f63cf5e7..49b4ff8b56dd 100644 --- a/games-puzzle/shaaft/Manifest +++ b/games-puzzle/shaaft/Manifest @@ -1,4 +1,5 @@ -MD5 5c8f38a34837fc8cf048f6e9080e4ef5 shaaft-0.5.0.ebuild 973 +MD5 06d74c5b13a7100ae554a8b8f1b43acf shaaft-0.5.0.ebuild 1018 +MD5 d20faa07627398113a16ef19537398e0 ChangeLog 584 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 84804eb6c5c4deb81810cd731e5823e2 ChangeLog 403 +MD5 ee787c086ea75ca819d582f8be04f0bf files/shaaft-0.5.0-gcc34.patch 544 MD5 3b94f9a4427c26cf66ebcff72c849efc files/digest-shaaft-0.5.0 65 diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch new file mode 100644 index 000000000000..604eb7155652 --- /dev/null +++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch @@ -0,0 +1,19 @@ +diff -uprN Shaaft-0.5.0.orig/utils/HashString.hpp Shaaft-0.5.0/utils/HashString.hpp +--- Shaaft-0.5.0.orig/utils/HashString.hpp 2005-06-05 18:12:29.000000000 +0200 ++++ Shaaft-0.5.0/utils/HashString.hpp 2005-06-05 18:24:05.000000000 +0200 +@@ -21,6 +21,7 @@ using namespace std; + + namespace HASH_NAMESPACE + { ++ template <> + struct hash<const string> + { + //a simple hash function for string +@@ -32,6 +33,7 @@ namespace HASH_NAMESPACE + } + }; + ++ template <> + struct hash<string> + { + //a simple hash function for string diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild index 44e17780d14e..0977dc236b0a 100644 --- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild +++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.4 2004/07/01 05:24:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.5 2005/06/05 16:27:11 luckyduck Exp $ -inherit games +inherit eutils games S="${WORKDIR}/${P/s/S}" DESCRIPTION="A falling block game similar to Blockout" @@ -32,6 +32,8 @@ src_unpack() { sed -i \ -e 's:DATA_DIR:"'${GAMES_DATADIR}'\/'${PN/s/S}\/'":g' game/main.cpp \ || die "sed main.cpp failed" + + epatch ${FILESDIR}/${P}-gcc34.patch } src_install() { |