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 | 8473bbd2cdbaaf9bc9040064265bb48633580373 (patch) | |
| tree | 3e4499604d55bf737b3e7254ea2473a20f19a856 | |
| parent | oops, src_compile should be src_install (diff) | |
| download | historical-8473bbd2cdbaaf9bc9040064265bb48633580373.tar.gz historical-8473bbd2cdbaaf9bc9040064265bb48633580373.tar.bz2 historical-8473bbd2cdbaaf9bc9040064265bb48633580373.zip | |
Added patch to enable compilation with a 3.4.x gcc/g++, fixes #94301.
Package-Manager: portage-2.0.51.22-r1
| -rw-r--r-- | games-puzzle/shaaft/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/shaaft/Manifest | 15 | ||||
| -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, 43 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..0c422c1640a8 100644 --- a/games-puzzle/shaaft/Manifest +++ b/games-puzzle/shaaft/Manifest @@ -1,4 +1,15 @@ -MD5 5c8f38a34837fc8cf048f6e9080e4ef5 shaaft-0.5.0.ebuild 973 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 88c54165d367e6b2e533ce539314818f shaaft-0.5.0.ebuild 1018 +MD5 56a0856338e98456e5d91b9a0d33f3c1 ChangeLog 585 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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFCoyf406ebR+OMO78RAn06AJ40kDUooE1vQ2pWtjUeh6WcLaHn9wCfYCbu +2ysEQSI64leLvQjzWJa0fBA= +=6XSV +-----END PGP SIGNATURE----- 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() { |