summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-26 12:12:49 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-26 12:12:49 +0000
commit370f722682bfc664a0d81af36d6f446087e1ecad (patch)
tree38a2ffef0063acd8275cc61ae5e2fb6199b6b862 /games-strategy/widelands
parentppc64 stable wrt #363359 (diff)
downloadhistorical-370f722682bfc664a0d81af36d6f446087e1ecad.tar.gz
historical-370f722682bfc664a0d81af36d6f446087e1ecad.tar.bz2
historical-370f722682bfc664a0d81af36d6f446087e1ecad.zip
Build with gcc-4.6 Bug #362379
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'games-strategy/widelands')
-rw-r--r--games-strategy/widelands/ChangeLog6
-rw-r--r--games-strategy/widelands/Manifest15
-rw-r--r--games-strategy/widelands/files/widelands-0.15-gcc46.patch10
-rw-r--r--games-strategy/widelands/widelands-0.15.ebuild5
4 files changed, 31 insertions, 5 deletions
diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 002e8a1c76d6..96f230a8a0fe 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/widelands
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.32 2011/02/26 16:44:28 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.33 2011/04/26 12:12:49 tupone Exp $
+
+ 26 Apr 2011; Tupone Alfredo <tupone@gentoo.org> widelands-0.15.ebuild,
+ +files/widelands-0.15-gcc46.patch:
+ Build with gcc-4.6 Bug #362379 by Diego Elio Pettenò
26 Feb 2011; Kevin McCarthy <signals@gentoo.org> widelands-0.15.ebuild:
Updated depends from media-libs/jpeg to virtual-jpeg
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index e1d8760d6cbc..4c36200e64d7 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX widelands-0.15-build.patch 1839 RMD160 baedf2f0e20815fdafd8c256a1d339bf32170f21 SHA1 71544823e8c75784db9fa4dcb875fe03f4c1cab8 SHA256 002afd51479536cf796cbab60515ff133bc6fb31d9e9322f966e6217dfdcdd1d
AUX widelands-0.15-gcc45.patch 1968 RMD160 be797bf86bb24896b7ccc46848726ba8ee15e71d SHA1 b5e5ecb72ad004f39cc77c5b1e0cce5f26bf3746 SHA256 f30fb6ed536fc9caa97fe2fa0b14c162b6469d9e9371beeb183ab7bbb342686b
+AUX widelands-0.15-gcc46.patch 245 RMD160 8b126b213d1eb69ee88903a0b4f1f88743472fa4 SHA1 9cc1519c842afc5e4132b511b5f782b00d1c832d SHA256 fb57dfd043e1ede92ada6b0592d269eef8217ca40cceccf0d6b2a23f8b3d3922
AUX widelands-0.15-locale.patch 488 RMD160 f194d94e29745084371e735cd913cafbd1b615d0 SHA1 a2f7073ad6e9c5aa642ff03f653865f7413deb84 SHA256 789b80cb441b39fdb54e0b8b9dafbad93786d8b7f23caee3221e42667c05dcfe
DIST widelands-build15-src.tar.bz2 107471022 RMD160 23dd238978cf97cea2abcb2b8178b090d790cf77 SHA1 dfa3c1bf701dec55cefb5b10f278da037c9288ea SHA256 99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03
-EBUILD widelands-0.15.ebuild 1624 RMD160 375dffde45bbfb596d199b84e93b9f29ef4bd7c7 SHA1 8cab1046bacb6666f2ad0569ad628c30483bdb3e SHA256 c4d984b77534ca2f7f82f04dd735d6071b82fa055c9c94758e3d1075ff953fbe
-MISC ChangeLog 5411 RMD160 d1b4effd837dcd3f57b66c5a53c4f6efa68a5e38 SHA1 20b4cda8782a02c1e0e66e306a051fa0cb8f7f40 SHA256 a2ccdc1e9bb08cda8384ea1da4eceac4cc1e7a301c6e13075d0441ee0beb716c
+EBUILD widelands-0.15.ebuild 1658 RMD160 8c3bda1c60f64ba132a860eb4c9b630c544a98cd SHA1 f8c4c083a20742dc2a9f88e6f1925cfe4ccb452c SHA256 8b1beef3d2c92ce817eb427d65cc2e9ba796a4516641feaed3027d3eb0cfa5b9
+MISC ChangeLog 5577 RMD160 21878238f04c8bda3ffa7055ee1ea8293ea7fd8e SHA1 a02d3d751611924240ed514148d451c36301856d SHA256 e86928a9b24f879b57f460acbe1b1fddfce0a0cd8101234cb40df696d8da48dc
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk22ts4ACgkQIY77eQFFFC2gjwCfX70K0Mbfb6S1UbPvFjLkhfOO
+VFMAoN3UnQRyzXc+VmN7iBQ4aKbHuQWN
+=6Q11
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/widelands/files/widelands-0.15-gcc46.patch b/games-strategy/widelands/files/widelands-0.15-gcc46.patch
new file mode 100644
index 000000000000..9f1d06796765
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.15-gcc46.patch
@@ -0,0 +1,10 @@
+--- src/economy/supply_list.h.old 2011-04-26 12:25:14.102136343 +0200
++++ src/economy/supply_list.h 2011-04-26 13:32:57.127500881 +0200
+@@ -21,6 +21,7 @@
+ #define SUPPLY_LIST_H
+
+ #include <vector>
++#include <cstddef>
+
+ namespace Widelands {
+
diff --git a/games-strategy/widelands/widelands-0.15.ebuild b/games-strategy/widelands/widelands-0.15.ebuild
index 0de6e8314327..47f8cf772a27 100644
--- a/games-strategy/widelands/widelands-0.15.ebuild
+++ b/games-strategy/widelands/widelands-0.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.15.ebuild,v 1.7 2011/02/26 16:44:28 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.15.ebuild,v 1.8 2011/04/26 12:12:49 tupone Exp $
EAPI=2
inherit eutils versionator cmake-utils games
@@ -36,7 +36,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-build.patch \
"${FILESDIR}"/${P}-locale.patch \
- "${FILESDIR}"/${P}-gcc45.patch
+ "${FILESDIR}"/${P}-gcc45.patch \
+ "${FILESDIR}"/${P}-gcc46.patch
sed -i \
-e 's:__ppc__:__PPC__:' src/s2map.cc \