summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-08-31 05:18:07 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-08-31 05:18:07 +0000
commit20d26a211f591bf40d9a672841b98b20059a54c8 (patch)
tree10780507d3fde23ea9ef1cbe286df284b26000d5
parentold (diff)
downloadhistorical-20d26a211f591bf40d9a672841b98b20059a54c8.tar.gz
historical-20d26a211f591bf40d9a672841b98b20059a54c8.tar.bz2
historical-20d26a211f591bf40d9a672841b98b20059a54c8.zip
patch to build with gcc4.3 submitted by Bert Karwatzki via bug #232069
Package-Manager: portage-2.1.4.4
-rw-r--r--games-strategy/galaxyhack/ChangeLog8
-rw-r--r--games-strategy/galaxyhack/Manifest5
-rw-r--r--games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch12
-rw-r--r--games-strategy/galaxyhack/galaxyhack-1.74.ebuild7
4 files changed, 25 insertions, 7 deletions
diff --git a/games-strategy/galaxyhack/ChangeLog b/games-strategy/galaxyhack/ChangeLog
index 439e403b9c1b..8511e69cd70f 100644
--- a/games-strategy/galaxyhack/ChangeLog
+++ b/games-strategy/galaxyhack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/galaxyhack
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.5 2007/11/10 00:47:17 tupone Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.6 2008/08/31 05:18:06 mr_bones_ Exp $
+
+ 31 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/galaxyhack-1.74-gcc43.patch, galaxyhack-1.74.ebuild:
+ patch to build with gcc4.3 submitted by Bert Karwatzki via bug #232069
*galaxyhack-1.74 (10 Nov 2007)
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
index 749a3a279ece..de4ee9534a05 100644
--- a/games-strategy/galaxyhack/Manifest
+++ b/games-strategy/galaxyhack/Manifest
@@ -1,7 +1,8 @@
AUX galaxyhack-1.74-boost.patch 245 RMD160 07182eeefde50834a051bd19a98c45885503226d SHA1 aa702e4fd2e7c4f3e50bfa364fbc5e8f50a52558 SHA256 1aeb8d201d8d76fe9953afa34e93e82cd31c62234a5fd33bb6b776f3e7980722
AUX galaxyhack-1.74-destdirs.patch 767 RMD160 417696eaf75f10ebb0bf58e317bee730b877541b SHA1 8889d58bd6611b92b40b2f3627aad3a42e10b215 SHA256 6a469f6a3c1cfb556483f42d4d3aad90fb2ea99c4df5edaaf134c229e7d38f05
+AUX galaxyhack-1.74-gcc43.patch 309 RMD160 50961e62a78ac56545307eb0c4ca4f4c68566bf5 SHA1 32b630e1841b4074df1bc6c17190c445ec243b82 SHA256 7808ab6f84a6467b09699762fba3225275936647f34408c423499bed5faa1ca3
DIST galaxyhack-1.74.tar.bz2 9948336 RMD160 b84de9a93709093d572732018f30cafeb3c7439c SHA1 0e5e691662bfe5b52689efda883b94813897a85c SHA256 ae6529008fe5be76607ce78833ef3b5d55e10f60a998b5747255b0854037880a
DIST galaxyhack.png 819 RMD160 8cf27749f4672158d66a39c760bdef21306ecc23 SHA1 a01db93f2b3c3c32cfd447e26b5b4f389efe05fd SHA256 248d32aeaa03e4183cf0333bd4da1d32ea11883fcb77efe6ebc6e2be201e9903
-EBUILD galaxyhack-1.74.ebuild 1741 RMD160 b5ae24a1a26b9b6ecf62a743c67b367a8d95b8f0 SHA1 9f403a1b72de79557740e9e0fc3511a9c9db7d53 SHA256 5e01e85598f3dfa6b7fcb2464d7c14bef9ab6dd186fa21cda2d5b794b42682c7
-MISC ChangeLog 1038 RMD160 33ef26e0d9e4009f52fbabe2f560ff12b44e3077 SHA1 ef8555939bd568eea9c22b3935c5d14b08141502 SHA256 156ac3850921f225bce48cd342ee3c16c7ecc61bbb0e84d8e9c55580d28d53b6
+EBUILD galaxyhack-1.74.ebuild 1779 RMD160 a4aa96d919c93abcb54a635b4f8a6f8bfe8e4fa1 SHA1 234f60adfcfe9abbe48145c700db8298757dc3e7 SHA256 a0b832a1c328976875f2bff4fdb60b6c908912542c548a0e9a480e3505069850
+MISC ChangeLog 1232 RMD160 1e28e2ae236fcfddc8196da76cce495d3e770ed0 SHA1 868b3c098209512155caa8245f3157157534893e SHA256 28757a8c2bdee8437b5e3eb6ae8142c7e935b972091c220c0fe7a80f4cb5b733
MISC metadata.xml 1207 RMD160 42f594c141624b20faf04966bda60ef38998871a SHA1 a0e134c3a46fa92c1f076814b5e57da2c1d8dd7f SHA256 b49a896d99275f98ee92e6b225f573551e4eb1af5af57b88ebf2d8d5fa63c295
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
new file mode 100644
index 000000000000..eeb64d12e587
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
@@ -0,0 +1,12 @@
+diff -aur src.old/JSDL.cpp src/JSDL.cpp
+--- src.old/JSDL.cpp 2008-07-17 18:31:38.000000000 +0200
++++ src/JSDL.cpp 2008-07-17 19:19:39.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <cstdlib>
+ #include <fstream>
+ #include <stdexcept>
+-
++#include <cstring>
+ using std::runtime_error;
+ using std::memcpy;
+
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
index 22281dc5fb35..77c3c7462c84 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.1 2007/11/10 00:47:17 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.2 2008/08/31 05:18:06 mr_bones_ Exp $
inherit eutils games
@@ -27,7 +27,8 @@ src_unpack() {
edos2unix Makefile
epatch \
"${FILESDIR}"/${P}-destdirs.patch \
- "${FILESDIR}"/${P}-boost.patch
+ "${FILESDIR}"/${P}-boost.patch \
+ "${FILESDIR}"/${P}-gcc43.patch
sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
Main.cpp \
|| die "sed Main.cpp failed"