summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-03-26 08:50:04 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-03-26 08:50:04 +0000
commitefcaefe085a01cb971880e52b0c4eb4775e72cfc (patch)
tree6a429ac72033fbe2936beb9250c0cab4312dbfaf /games-action/teeworlds
parentBump (diff)
downloadhistorical-efcaefe085a01cb971880e52b0c4eb4775e72cfc.tar.gz
historical-efcaefe085a01cb971880e52b0c4eb4775e72cfc.tar.bz2
historical-efcaefe085a01cb971880e52b0c4eb4775e72cfc.zip
Fix build with gcc-4.6 Bug #374939
Package-Manager: portage-2.1.10.51/cvs/Linux i686
Diffstat (limited to 'games-action/teeworlds')
-rw-r--r--games-action/teeworlds/ChangeLog6
-rw-r--r--games-action/teeworlds/Manifest13
-rw-r--r--games-action/teeworlds/files/teeworlds-0.5.2-gcc46.patch10
-rw-r--r--games-action/teeworlds/teeworlds-0.5.2.ebuild5
4 files changed, 25 insertions, 9 deletions
diff --git a/games-action/teeworlds/ChangeLog b/games-action/teeworlds/ChangeLog
index 22fea2bd0486..f3c6d8d518a3 100644
--- a/games-action/teeworlds/ChangeLog
+++ b/games-action/teeworlds/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/teeworlds
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.4 2012/03/25 10:12:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.5 2012/03/26 08:50:04 tupone Exp $
+
+ 26 Mar 2012; Tupone Alfredo <tupone@gentoo.org> teeworlds-0.5.2.ebuild,
+ +files/teeworlds-0.5.2-gcc46.patch:
+ Fix build with gcc-4.6 Bug #374939 by Diego Elio Petten
25 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Set herd as primary maintainer as told with volkmar.
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 06f5c33ec760..e0f670106e47 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,17 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX teeworlds-0.5.2-gcc46.patch 263 RMD160 c57014900e7f7933b2516ec4e37bbb1ffd3177c6 SHA1 10d55b860e3c251d69be1c3727c3597a24eadb3f SHA256 04e9c02c36885677845bd83fbdac02a216c5ee32f677d0fe4a510537420b15fe
AUX teeworlds-0.5.2-system-libs.patch 1861 RMD160 8d60b4506440fad9907501a340e016e7f68f4385 SHA1 e8113d7f30a7e0866b6e87934f63a2e1bb2dbff7 SHA256 a748535f57b62d056c302c290dd47e29cc7a2e4d5bc345527c5ce70b97ce607b
AUX teeworlds-0.5.2-wavpack.patch 1347 RMD160 b1f86935b5781306f7adc8a78736d60de2dce848 SHA1 d8ffad789c27b6627a59201904e980aaa2c8f6d4 SHA256 efa498dafb12fb646fc6678592b47eaab8497ecefb2cdc5a0ace663d49eebb3d
AUX teeworlds.xpm 2785 RMD160 f45531cd48dc897b02c73fee5870f703877620da SHA1 1a00d39a748ea006f71f4b7c0ed73015e34a18a0 SHA256 0b31cc3e65ca26676324a7b66de29cb91df90221e28f9e4b5adfec0e37729284
DIST teeworlds-0.5.2-src.tar.gz 6393472 RMD160 12b3384b3059d5ec0ebb437686f613f8d9430e61 SHA1 26d8059b1ad81ca6959b96fd3ff881f9db7550ef SHA256 1811a71bf9a1470c7a69308035744492f3e850aefdd12f1bc223fb85d98cf4c0
-EBUILD teeworlds-0.5.2.ebuild 2357 RMD160 ed75e11c7c2ec6d1e005e9f3c6a6bb8222ddf008 SHA1 5f2d9e4f40f965ec105374fe9778ed2f512c6961 SHA256 66f2f226af79aa280bcf5ac0356991d25687e7c41ceac7807397994a6e4e6152
-MISC ChangeLog 1169 RMD160 5262508bd6a95ac40ab80042f0ac087d7c1cf0cf SHA1 8c274e0b3509fe25307c990720883eaa24007dae SHA256 029b56203f9918c5fdf52dfe28154483038d6d86a1e34eb0583de1c6e4eeb1d1
+EBUILD teeworlds-0.5.2.ebuild 2389 RMD160 c11b14424b34682d2a25fa061a08cb321b0a02dd SHA1 b5de3d8ccf765a617dd9c8c158f213c7fa3ed780 SHA256 55a315dcc02532fa9d525ec66497674edb84e901938e1559f11d55483bf7de5e
+MISC ChangeLog 1341 RMD160 a4c3a1103c24889ff7c05bbf3e88c5e1c50ce50c SHA1 02accccc4c9a21c6bb683e9719c8502b5481ae4b SHA256 e5b98c27c5ca79e3b3a2dc733789bdb588c418dea5a05e5095ea0bd4c52b12b3
MISC metadata.xml 309 RMD160 77d06e39802ded0077343efe4e113a4fc23cbe0d SHA1 479fb96f2b7ad915bee07e5f46e407908bd678d7 SHA256 483d678f443d433b99a05dca001e83ae6f3d9128c2d6236196ec972386ef337a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk9u754ACgkQCaWpQKGI+9Sc/gCeJHdUlMv16j6ZDLOJrMmLqarB
-uB8An0YCxHpY7wuV6l99dj48FAWQiehc
-=6uv6
+iEYEARECAAYFAk9wLcgACgkQIY77eQFFFC1c7gCfS5rRZPVwrYL/YU91ncUyXmfq
+J2gAn18zcwljeA5pDCW1bP28PVEXdmfD
+=HSYo
-----END PGP SIGNATURE-----
diff --git a/games-action/teeworlds/files/teeworlds-0.5.2-gcc46.patch b/games-action/teeworlds/files/teeworlds-0.5.2-gcc46.patch
new file mode 100644
index 000000000000..06f9422a274e
--- /dev/null
+++ b/games-action/teeworlds/files/teeworlds-0.5.2-gcc46.patch
@@ -0,0 +1,10 @@
+--- src/game/server/entity.hpp.old 2012-03-26 10:32:17.189461453 +0200
++++ src/game/server/entity.hpp 2012-03-26 10:32:52.176006440 +0200
+@@ -3,6 +3,7 @@
+
+ #include <new>
+ #include <base/vmath.hpp>
++#include <cstddef>
+
+ #define MACRO_ALLOC_HEAP() \
+ public: \
diff --git a/games-action/teeworlds/teeworlds-0.5.2.ebuild b/games-action/teeworlds/teeworlds-0.5.2.ebuild
index c074b0118928..769d79c74c83 100644
--- a/games-action/teeworlds/teeworlds-0.5.2.ebuild
+++ b/games-action/teeworlds/teeworlds-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.5.2.ebuild,v 1.3 2011/04/09 16:39:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.5.2.ebuild,v 1.4 2012/03/26 08:50:04 tupone Exp $
EAPI=2
inherit eutils python games
@@ -35,6 +35,7 @@ pkg_setup() {
src_prepare() {
epatch \
"${FILESDIR}"/${P}-system-libs.patch \
+ "${FILESDIR}"/${P}-gcc46.patch \
"${FILESDIR}"/${P}-wavpack.patch
# fix includes