summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-05-09 15:53:23 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-05-09 15:53:23 +0000
commit4e88148b76e53c9db240806885435b075939068e (patch)
tree1f219f0c55f3bf67b448ee9723333bc3b1ef9937 /games-simulation
parentVersion bump to latest. Drop older. (diff)
downloadhistorical-4e88148b76e53c9db240806885435b075939068e.tar.gz
historical-4e88148b76e53c9db240806885435b075939068e.tar.bz2
historical-4e88148b76e53c9db240806885435b075939068e.zip
Build with gcc-4.6 Bug #366201
Package-Manager: portage-2.1.9.48/cvs/Linux x86_64
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/simutrans/ChangeLog8
-rw-r--r--games-simulation/simutrans/Manifest15
-rw-r--r--games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch10
-rw-r--r--games-simulation/simutrans/simutrans-0.102.2.2.ebuild5
4 files changed, 32 insertions, 6 deletions
diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index 600c13280695..475ef8fb59f7 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-simulation/simutrans
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.26 2010/05/24 18:57:09 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.27 2011/05/09 15:53:23 tupone Exp $
+
+ 09 May 2011; Tupone Alfredo <tupone@gentoo.org> simutrans-0.102.2.2.ebuild,
+ +files/simutrans-0.102.2.2-gcc46.patch:
+ Build with gcc-4.6 Bug #366201 by Diego Elio Pettenò
24 May 2010; Pacho Ramos <pacho@gentoo.org> simutrans-0.102.2.2.ebuild:
stable amd64, bug 317243
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index c5f3e0166a8b..1b95150b5954 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX simutrans-0.102.2.2-gcc46.patch 280 RMD160 3ef61f3cf3b248af92dccebe581ed3445984e26a SHA1 43a0a767d23a9f61d507026e37ec6f947f3c4601 SHA256 e9cf8557799fb825b9f395b0d48071bbf00459d373f93e86c7e6e8b0c92d91c6
DIST simulinux-complete-102-2-2.zip 6115022 RMD160 6539c3bc66d4c6a9e6f67dbcf640e0f1588c9618 SHA1 f74d2ac9e03f86754881006c7a36d7089a6d1d6b SHA256 0f7752b7625ecfe18ab29f724321249ca9cc49cc9e05e392b3d19190188a6c98
DIST simupak64-addon-food-102-2-1.zip 113454 RMD160 f57902d9c882196e50042daa31ba8f0b540599ee SHA1 e41abf1bdd480190bf7a46764895b43b9d65d3c1 SHA256 7add9c3e3dc3959c6a39776043a16beb92f6f59190fcae25b29e367c17e24607
DIST simutrans-src-102-2-2.zip 2498680 RMD160 c521a50a25fff19a292571f093c0352dead4e941 SHA1 e956fefcf181a32f999d68ff49dbb73c9d9ff566 SHA256 b105013ba180706a4790eddf19e007e1955c4ef7daa1c90fb6aaa48c28134351
-EBUILD simutrans-0.102.2.2.ebuild 1629 RMD160 ffc28a5b8bf8e254495d5ec8f9999aa4eadbf4ca SHA1 b0c9cd9c81d4cbb8cc77960dbb36dfefd08e2ccd SHA256 5ab49c07663788caaa3b90ca2403e6025f2b268f1f226743d2f3d02ae8e896f7
-MISC ChangeLog 4375 RMD160 c00e1d5c9325c509e9e0fb9f9c6f266addf06318 SHA1 0d76d6272b7828e94b7094ed20ef2b511c7619cc SHA256 6f44b67bf899a2435522a8fd27de912d5517c829517da1472f18482eb66033db
+EBUILD simutrans-0.102.2.2.ebuild 1669 RMD160 32e217ba9ae0d545d2de9b281600f5aac59b6ef1 SHA1 589bd287a36eeb2ecfdb1045b6cabe104b92e771 SHA256 69134b1bce307d1cda20d021876832d8c9a5e7ad52e5cafdc53e9d72e414536f
+MISC ChangeLog 4553 RMD160 be3432813d04142550886021be05b873ee9d9496 SHA1 aaed7992c69984bba1eb3767985555d88a45b1a6 SHA256 d99cc9c221eeb1a68ae5da4486d2c069597081704bda868f8234a7bfa7b3fe89
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3H2xwACgkQIY77eQFFFC2IDACgylu+onOJtRlfCQ3T6df6nCvK
+q+0AoIvi1P+iCOq0kZwgIhZ+hpYqVH4s
+=LlUh
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch b/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch
new file mode 100644
index 000000000000..8773c8288797
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch
@@ -0,0 +1,10 @@
+--- tpl/slist_tpl.h.old 2011-05-09 14:01:02.299244745 +0200
++++ tpl/slist_tpl.h 2011-05-09 14:01:39.973619614 +0200
+@@ -8,6 +8,7 @@
+ #ifndef tpl_slist_tpl_h
+ #define tpl_slist_tpl_h
+
++#include <cstddef>
+ #include <iterator>
+ #include <typeinfo>
+ #include "../dataobj/freelist.h"
diff --git a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild b/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
index e0b3330e4f9c..47b574ea3243 100644
--- a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
+++ b/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.102.2.2.ebuild,v 1.3 2010/05/24 18:57:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.102.2.2.ebuild,v 1.4 2011/05/09 15:53:23 tupone Exp $
EAPI=2
inherit flag-o-matic eutils games
@@ -52,6 +52,7 @@ FLAGS=-DSTEPS16" > config.default \
|| die "sed failed"
rm -f simutrans/simutrans
+ epatch "${FILESDIR}"/${P}-gcc46.patch
}
src_install() {