summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-06-21 00:59:07 +0000
committerTristan Heaven <tristan@gentoo.org>2009-06-21 00:59:07 +0000
commitcc1756cfa1c44a2b9e2f5929f15ec4091d51c9a2 (patch)
tree25339b6474493360d350acb3f17873df928ac73e
parentVersion bump. Documentation seems to be no longer available. (diff)
downloadhistorical-cc1756cfa1c44a2b9e2f5929f15ec4091d51c9a2.tar.gz
historical-cc1756cfa1c44a2b9e2f5929f15ec4091d51c9a2.tar.bz2
historical-cc1756cfa1c44a2b9e2f5929f15ec4091d51c9a2.zip
Fix building with gcc-4.4, bug #273532
Package-Manager: portage-2.2_rc33/cvs/Linux i686
-rw-r--r--games-strategy/boswars/ChangeLog8
-rw-r--r--games-strategy/boswars/Manifest15
-rw-r--r--games-strategy/boswars/boswars-2.5.ebuild7
-rw-r--r--games-strategy/boswars/files/boswars-2.5-gcc44.patch20
4 files changed, 43 insertions, 7 deletions
diff --git a/games-strategy/boswars/ChangeLog b/games-strategy/boswars/ChangeLog
index 0d0f67ccbed6..e4ff18226e70 100644
--- a/games-strategy/boswars/ChangeLog
+++ b/games-strategy/boswars/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/boswars
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.8 2008/05/01 00:21:34 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/ChangeLog,v 1.9 2009/06/21 00:59:07 nyhm Exp $
+
+ 21 Jun 2009; Tristan Heaven <nyhm@gentoo.org> boswars-2.5.ebuild,
+ +files/boswars-2.5-gcc44.patch:
+ Fix building with gcc-4.4, bug #273532
01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+files/boswars-2.5-gcc43.patch, boswars-2.5.ebuild:
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
index c5b27c33e32d..ce111ad27457 100644
--- a/games-strategy/boswars/Manifest
+++ b/games-strategy/boswars/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX boswars-2.5-gcc43.patch 465 RMD160 01bd439ab17f7402b3cfd62f27a4973d1bf60175 SHA1 69f2bbd7948b4f5630874af75bbaaff060b66d7e SHA256 ad117646bb8ae25ee317948da0e3ba750dcca10f6905e66e8e8c0f6632a955c4
+AUX boswars-2.5-gcc44.patch 438 RMD160 53f8384d0fe76037ed1c78622161deaafddd1c3f SHA1 5d5a9bb0c85a55f4f698321802455c0709403824 SHA256 8ecee13e5846391c0f3c346b158d437ee0c15ba57d24e6ed141a65338339e167
AUX boswars-2.5-gentoo.patch 1025 RMD160 e1308e93f80eeac323f5dda5c9586abe2db1d088 SHA1 3b9ef3962d2cc37e64bb9f575e99971a2ef036da SHA256 cdd3bc4beaa5060343c7cb7ac5219b5eb6fb9384cf251590d8f2df3cdb840546
DIST bos.png 620 RMD160 19822ea636b7a7995a348332dffb40e302c61a6e SHA1 e0088d4e3d9b7376563e4bb31dba30e1820dcf66 SHA256 fe1d24bc722093bd3882ecab15c15f61b6b0edee263bfd58af662825e76d8b0a
DIST boswars-2.5-src.tar.gz 63851225 RMD160 dc42410f3d89c588b579ee7c0d47627c5d455362 SHA1 7305eaea67a0df8dd689df821573dab17e8de01a SHA256 ac5d9c8227fec012087ff617ea62666c7517b7bf2ac4c52be9030bd5ccef7f13
-EBUILD boswars-2.5.ebuild 1491 RMD160 793cc21177e0f1cdbfed6460cc3f13432c47f9bf SHA1 338644e63f801041880b439c61b84f08f9819d6a SHA256 bf414e7e02febba1806ae2b821bfdc5b247e9dc82ca1844f874b409414af972b
-MISC ChangeLog 1469 RMD160 df6c65c470dcfc509380df0b0bbc10f1b00cc300 SHA1 6b32d0ec9bd8ad8ff0f43aacbe6abdc904e3426d SHA256 e0bf63fc6849f9043d28417551a72d65eb932b0e3d1369bbb441829e5647dadd
+EBUILD boswars-2.5.ebuild 1526 RMD160 33cea0d6d47290c6f955679d8e1d9f8c0ae6d23d SHA1 be22a958ff18c51b050f92298064d64cfc1a2633 SHA256 0d9dd3e567e4909e7dd9f12fd11b2f22ed81a721df55eb203ab3c5f759cb4071
+MISC ChangeLog 1613 RMD160 2bc48eaeeed2c7fe0b2f8b319868cd4edf7c9dc9 SHA1 b261bb37933078bad76cbbc9164af7b7ab22b576 SHA256 438188a4fe6677656316c965532132bcb9963443091f2072d7c8cd2f13e7964c
MISC metadata.xml 423 RMD160 9d009a8f49f9779eb0e508af34e0cc9e8d08c5f6 SHA1 c45842ff445b38e3085cc00ca266c097ebb1df14 SHA256 7e533fc54fb9f2a01faecc29086a7de01949da7f1e1e46edf8f0e6a7b76764cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko9heQACgkQdz7hIScOURHJDACg4SVWXvHvGx8cmsWwHEjcdA5M
+H28AnRRHwb1HR86gC4IkSnpKbnlXDKyd
+=jS/e
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/boswars/boswars-2.5.ebuild b/games-strategy/boswars/boswars-2.5.ebuild
index 35625404f464..c8bb709616c1 100644
--- a/games-strategy/boswars/boswars-2.5.ebuild
+++ b/games-strategy/boswars/boswars-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v 1.2 2008/05/01 00:21:34 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boswars/boswars-2.5.ebuild,v 1.3 2009/06/21 00:59:07 nyhm Exp $
inherit eutils games
@@ -33,7 +33,8 @@ src_unpack() {
rm -f doc/{README-SDL.txt,guichan-copyright.txt}
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
sed -i \
-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
engine/include/stratagus.h \
diff --git a/games-strategy/boswars/files/boswars-2.5-gcc44.patch b/games-strategy/boswars/files/boswars-2.5-gcc44.patch
new file mode 100644
index 000000000000..7d4516883713
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.5-gcc44.patch
@@ -0,0 +1,20 @@
+--- engine/pathfinder/astar.cpp
++++ engine/pathfinder/astar.cpp
+@@ -33,6 +33,7 @@
+ -- Includes
+ ----------------------------------------------------------------------------*/
+
++#include <cstdio>
+ #include "stratagus.h"
+ #include "pathfinder.h"
+
+--- engine/stratagus/translate.cpp
++++ engine/stratagus/translate.cpp
+@@ -36,6 +36,7 @@
+
+ #include <map>
+ #include <string>
++#include <cstdio>
+
+ #include "translate.h"
+ #include "iolib.h"