Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/games-strategy/0ad
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-06-17 20:45:02 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-06-17 20:45:02 +0000
commitda927727b74b869d2be03d3622a12d813a029bcf (patch)
treeb2e5b06bf3fb6d75ab3c5425a6488d8565640c64 /games-strategy/0ad
parentEnable multilib support. (diff)
downloadhistorical-da927727b74b869d2be03d3622a12d813a029bcf.tar.gz
historical-da927727b74b869d2be03d3622a12d813a029bcf.tar.bz2
historical-da927727b74b869d2be03d3622a12d813a029bcf.zip
add patch that fixes UD, fix HOMEPAGE
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'games-strategy/0ad')
-rw-r--r--games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild (renamed from games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild)7
-rw-r--r--games-strategy/0ad/ChangeLog8
-rw-r--r--games-strategy/0ad/Manifest33
-rw-r--r--games-strategy/0ad/files/0ad-0.0.16_alpha-gcc-4.9.patch42
4 files changed, 70 insertions, 20 deletions
diff --git a/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild
index 76043c9de79d..64934bc671ca 100644
--- a/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/0ad-0.0.16_alpha-r1.ebuild,v 1.1 2014/05/22 12:06:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild,v 1.1 2014/06/17 20:44:55 hasufell Exp $
EAPI=5
@@ -10,7 +10,7 @@ inherit eutils wxwidgets toolchain-funcs gnome2-utils games
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://wildfiregames.com/0ad/"
+HOMEPAGE="http://play0ad.com/"
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
@@ -48,7 +48,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-gcc-4.9.patch
}
src_configure() {
diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog
index cfaa91c56b18..d1a443bb0881 100644
--- a/games-strategy/0ad/ChangeLog
+++ b/games-strategy/0ad/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-strategy/0ad
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/ChangeLog,v 1.2 2014/05/22 12:06:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/0ad/ChangeLog,v 1.3 2014/06/17 20:44:55 hasufell Exp $
+
+*0ad-0.0.16_alpha-r2 (17 Jun 2014)
+
+ 17 Jun 2014; Julian Ospald <hasufell@gentoo.org> -0ad-0.0.16_alpha-r1.ebuild,
+ +0ad-0.0.16_alpha-r2.ebuild, +files/0ad-0.0.16_alpha-gcc-4.9.patch:
+ add patch that fixes UD, fix HOMEPAGE
*0ad-0.0.16_alpha-r1 (22 May 2014)
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 260c9d58f990..4a2d48eb1c5e 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,27 +1,28 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX 0ad-0.0.16_alpha-gcc-4.9.patch 1092 SHA256 1b48326bfb60beb032968693fafd3c465b05c8e9eb76390bf5e65a816ca21ee3 SHA512 1083d9c90e0249b2dbc0382a73f4328b98af91f934e98f7dd5af7d10819e0bd345585371ad1b6baeb16a5e28ea703e761903b3f447f965a9ba6c21d90255c718 WHIRLPOOL ad9c610690b1da865e0d42728880d55e318e3ef9ad72fd6c04f6a757eaabe0ca3709ed61fbb75d3be70a593bdab5ea30c4d62a97884e2f2ae3500a8f05200a17
AUX 0ad-0.0.16_alpha-gentoo.patch 3176 SHA256 0631ab138fc937380b3c565a8aabe00c7b339ed6d1eef74a3e661aa277f7cd9b SHA512 8f1e5798257f814a4140f818fe30278ee2301c0130a79a46dbc3360b5cfe91db0a32dc62ed4fcb1db18962cb3a8a2b061553aaa2d70efb18806a76d32d745306 WHIRLPOOL 452351a0b43286e77cdd2b6f82730795a57f141fc56ea2fcc00f76e87d8a8a8af5288cdaf7d1149f74d74a4d15787f67cf5d88cd9f3631c815502718d3fa1e71
DIST 0ad-0.0.16-alpha-unix-build.tar.xz 20019680 SHA256 cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5 SHA512 9fe3440233d9827895b91ade1873afe977d62386a5dd6042d8169b153d576b462381bfc97e637f0b183aff034236380ca6d552ea2755cf08398143ad67121031 WHIRLPOOL 0e2f1ac9799a4b4d4588c2370a78195f2cc415fb2043be815ed2a2f9f179ccd856c405e7c0323f2033d3a6a4d63c08d8d5c8a05b50769ae3b9219717218edef6
-EBUILD 0ad-0.0.16_alpha-r1.ebuild 3431 SHA256 7403976e2ae5c60a2c10cbe0c4a30814e5e3710d5bf50b2c4bb35c12af4b7b9f SHA512 9d8aa7e8180e2c48260125ac7c404e8ad65be923884d06e94d60594f4ef57e6c5b7661ea2f260b3bc8dfcfa94f62bd8b67f365a18a739a8d01c6df891bc705ba WHIRLPOOL 90f6248860e2131ca6dfe61c807cbdead1131be99f79768f7c854b71c4f46fad4b733221ba4ca9afdf6479dcbfcbfb4221a51e326d92652be645fcc059be899e
-MISC ChangeLog 689 SHA256 33bd26b4389703c94cb4751505ae3c188d4a81db029887d819533147cde7a75d SHA512 0a20b7c4f3cb18a67452d317279f1e7d3479744257250c87b4a9a3d1b7fdf70e56f0eb2f3a37ae8872f844cfd8c4fd498965de2f84ee7f2e2f48dad391be344e WHIRLPOOL 82903369d92253a6749561e8dbd930f4a4c8a051d4d5c0c3048456442faab20278c071afe04d39a32f723be12e96025e799afab0b499241ea7588cbc47c42774
+EBUILD 0ad-0.0.16_alpha-r2.ebuild 3458 SHA256 f0a800dff3a634d9aafafb577c9cc90f34789155e145a21c9356e58afb800d38 SHA512 31b1db9c2032948f39463976a601e74fffe18fbb91ca00db719881922a5309c6b66d9010c5fe293fd057bd4c10d17a2e580d1be391c5373bcf88a2d435866d8e WHIRLPOOL ac9da94102abd573cc7e31fb68edbeb322b321b0c600b5be71af2f8698b5fae7b984882566839239e6fc9d0ce225a75c24daf811d1e3e629f91e399fc3f4401c
+MISC ChangeLog 916 SHA256 d37022e81542e779b0a13be70ab6bc1ae3115be5dbab684948183c0fe40aee1c SHA512 c5fa77e6af63003fdb89a4784a7e3fac2050f622761c915675b00dfc81433b5ac1324da1933e119c5db449cca70c758367507d1103a6ef059193903c7aa49fee WHIRLPOOL 379bb7a7b007008d85accbbf585ff2b92c397ea4edbace7a56c0ca3b98eeb4e10736d04bc4362c9bbf471564ba8e7b972a9fc7dbcbda3305244bbc07161b8daf
MISC metadata.xml 438 SHA256 8e370d849a6baeb52fc2d92273d54a2ebf9b5a131f6c46a9fcfeffeb681dae89 SHA512 50774792abb5a400d3ba88b38bcc45b0d22eddeab791acb2f73dbb4d91f1d0be1913adf6c49cc56083f2adfeb0f17a60e573f3e8b3cec961bc8cfc18866c1c83 WHIRLPOOL 65d5b7f8f4caa4956ed60c4849db12d9b0a1b8ac2924020cfaa368533ba0e4cae591e8ab4e513cfad034ecce8552917231745df8177dbbd5deed27e4604b7e6f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTfehCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJToKjMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgmQ0QAJdGRebPRp7QKZsFnsScFOmf
-SdZ47+qXzIVbVa8EVFwr51CD6CvAUEo6pIFhcetbxIalROSXOzbEbQ+JM3+tGU8B
-qHs3cxtE6d8e8IzeSDBmCFK4HyB63Ne9Ja8tPjR5ErT+VIuQ0K2QBAOtlWADTQ9Y
-2hBJ1sKlu+j6ZVceK6oHT8YvM6e+FrpJiqP/FOuciI9nL5G7IW9ZSLi2v9pg4/fs
-uaTLk3ORSvfadHp/XgccSVc+nZ3EG+lh+GoGdCnxeOLQWcY25lh5XoThTN+BYEVq
-MKNbJdpnYyZo/Ix6Jy2QBuIp3gsuksY7zwwiFNP5kwmvUd3ndv99NXOdyIFe0216
-8S/lr7xcPe4tewG3BsPa/LYabxGuSv0J46gzNR0W9aYoKc8vvGXYbnh/u3Rsjct0
-JVC2JXs9BSpQv6XDAZ+lLEvvVzQ3BtjMz53Q5EP1OAA8Q7oS1CNexi5HEPHOtiJf
-yyhQjlT3yW2D30WUuzEJwAMmayChm3Fq6T2qklubgkSJGPrk4AGccVonZY73v3z4
-6Zr6ZbAyLFxvZ6LquaMXUs5vjfocExdYckxyFVu1R/1PycMLvRvVN5hpGpKdW+a2
-2z0eHEle1xy41b+6OHY2l2308RuiGDDGQ9KGlZfw3eBRwum1XfOioAiawmHEWkEu
-LlXda90hM4+YhXlColZk
-=HZQ4
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg/r4P/2D6pyf/tsYo6W5h3aHHZJ1Y
+orXcglb8CcFFiV9CMXO9hrUiJXlyQS6c1V9Xd5L5HUTQQGYdSbupzr+vRVl+UVVw
+mLaUI3seCf2x9cA/RJnwf0M6ADmJGN13SfPFQMc0/jhVNw6mqgpJL8F4GZLOGO0Q
+l3J6a55JUNyEM+Bak+tvHbmLOHqL5EyP+VHMiYRBcRqoLg4ktj2MhGlkdnztr0f7
+UF+GMfcmNVs536rjVNDn9oe65KTPwp06ptORBWi2HBtfPn8INWRtPwW8ddVR/kU8
+fQwQAxP6+z5EcyDNuSr+SqV3o/ueGAatlWfbo0V1fdQOd3/Nfb2GEyiEDAlSEpLS
+UwOWmi4W1Sh7nBwn8bgZLI6xeb/o9IotWEUml0VdHchGOCwAHLaMY3HdDGYC9YW/
+E3rRnNHPS6AtysDseGfITZs2VIySs1bIrq74yEe129/ev5z7YUYMaOIxl4yxxAck
+t2qIVpT6IpLljH6aTEoDCcafVlb9v0o4z4o4v96bOr/gZOVSf4axDSwmnuVfWATJ
+M7kM5uIX6DV8XM13dxRauK3PrLFHGWD+1tiBiVikdIjYdDMGpTiZFSKA5BG4BNst
+0WITQ+SO1MuRhYp82H2RUJMZGCEjtphB7T/RI1vgQr2twrRsVja1WsxZq4N+Tqm/
+vGYkbjrEGCcMXU2EWK26
+=xEOG
-----END PGP SIGNATURE-----
diff --git a/games-strategy/0ad/files/0ad-0.0.16_alpha-gcc-4.9.patch b/games-strategy/0ad/files/0ad-0.0.16_alpha-gcc-4.9.patch
new file mode 100644
index 000000000000..5b17120b4f7b
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.16_alpha-gcc-4.9.patch
@@ -0,0 +1,42 @@
+Index: /ps/trunk/source/lib/allocators/headerless.cpp
+===================================================================
+--- /ps/trunk/source/lib/allocators/headerless.cpp (revision 15333)
++++ /ps/trunk/source/lib/allocators/headerless.cpp (revision 15334)
+@@ -55,10 +55,12 @@
+ }
+
+- FreedBlock(uintptr_t id, size_t size)
+- : m_magic(s_magic), m_size(size), m_id(id)
+- {
+- }
+-
+- ~FreedBlock()
++ void Setup(uintptr_t id, size_t size)
++ {
++ m_magic = s_magic;
++ m_size = size;
++ m_id = id;
++ }
++
++ void Reset()
+ {
+ // clear all fields to prevent accidental reuse
+@@ -411,6 +413,7 @@
+ FreedBlock* WriteTags(u8* p, size_t size)
+ {
+- FreedBlock* freedBlock = new(p) FreedBlock(s_headerId, size);
+- (void)new(Footer(freedBlock)) FreedBlock(s_footerId, size);
++ FreedBlock* freedBlock = (FreedBlock*)p;
++ freedBlock->Setup(s_headerId, size);
++ Footer(freedBlock)->Setup(s_footerId, size);
+
+ m_freeBlocks++;
+@@ -431,6 +434,6 @@
+
+ FreedBlock* footer = Footer(freedBlock);
+- freedBlock->~FreedBlock();
+- footer->~FreedBlock();
++ freedBlock->Reset();
++ footer->Reset();
+ }
+