diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-06-10 08:02:38 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-06-10 08:02:38 +0000 |
| commit | 08f20de2666824e9cdf2bbf51d9561e95e9816be (patch) | |
| tree | e1f5b685c10979d9c4de75c27313ffaaa673d5c6 /dev-games | |
| parent | Stable for HPPA (bug #270855). (diff) | |
| download | historical-08f20de2666824e9cdf2bbf51d9561e95e9816be.tar.gz historical-08f20de2666824e9cdf2bbf51d9561e95e9816be.tar.bz2 historical-08f20de2666824e9cdf2bbf51d9561e95e9816be.zip | |
Fix building with test and gcc-4.4 Bug #273424
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/mercator/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/mercator/Manifest | 5 | ||||
| -rw-r--r-- | dev-games/mercator/files/mercator-0.2.7-gcc44.patch | 10 | ||||
| -rw-r--r-- | dev-games/mercator/mercator-0.2.7.ebuild | 10 |
4 files changed, 26 insertions, 5 deletions
diff --git a/dev-games/mercator/ChangeLog b/dev-games/mercator/ChangeLog index 3467446a5de6..a9cb6feb6ccd 100644 --- a/dev-games/mercator/ChangeLog +++ b/dev-games/mercator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/mercator # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.8 2009/06/05 13:12:25 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.9 2009/06/10 08:02:38 tupone Exp $ + + 10 Jun 2009; Alfredo Tupone <tupone@gentoo.org> + +files/mercator-0.2.7-gcc44.patch, mercator-0.2.7.ebuild: + Fix building with test and gcc-4.4 Bug #273424 by Diego Petteno' *mercator-0.2.7 (05 Jun 2009) diff --git a/dev-games/mercator/Manifest b/dev-games/mercator/Manifest index 2d0e68df8258..fdcd6d31090e 100644 --- a/dev-games/mercator/Manifest +++ b/dev-games/mercator/Manifest @@ -1,6 +1,7 @@ +AUX mercator-0.2.7-gcc44.patch 238 RMD160 c4f69dc1b9c275e17512a3ff128f113fd1f88248 SHA1 152e32673d0db5300fe346c9120f113d90162e94 SHA256 64673ce96be37cf87d891ff17005e8c3b2c08008335ade6c77c193ae6c96001e DIST mercator-0.2.6.tar.gz 400463 RMD160 09518d79564748c76e8cb44b9e6fc279aa8be501 SHA1 b1795843056d132ae31dc75fdf14bee5d3fe2e5c SHA256 d5af442b3448318a55e1f69c7e97058c3080d3520a480b98dcf87acf978dd34e DIST mercator-0.2.7.tar.gz 403410 RMD160 f59cbcfab778828ea29d76d5883cb6b83986837d SHA1 cdb15b807767466d91b3811d4d4c15775df4f26d SHA256 8d4b81c3edd60a287d6634a20500c81ca82f260c7008ebfc021400a1337556d2 EBUILD mercator-0.2.6.ebuild 911 RMD160 f7546ac7a61c80c5b806b40decfae2dd9d5f35bc SHA1 4c1db7fe84b12526b7173f30623d9b3e896333f2 SHA256 3d0db9d63fe7d5914b18eb2d3a1820eaa9941242756e2f4e6fe0b793aaa6919b -EBUILD mercator-0.2.7.ebuild 875 RMD160 184a5284456cb43d53eefec4ea4a933fc087c670 SHA1 92a95681dca7f27493ec0d7f49931894e98dcf10 SHA256 8cc6a394fc033f0364c029a613e31dc757c68b1a9d4233f9d20681b426351e08 -MISC ChangeLog 1123 RMD160 5a2ca1dc671552ca50f2b72bd92df81cbe1d1b0c SHA1 89e1018e2bb208fd738728dee96485ba283712f6 SHA256 fbf4959154b57138b9dd77a10c0fcdab4fce4b43523f20e348b62b9d4199811d +EBUILD mercator-0.2.7.ebuild 941 RMD160 8747d9a1d9becb58e88b6c2b233f3f42b078d75e SHA1 a9fe0361e40f9833a8321a349abe8d3f70c69945 SHA256 87181ecaabd9c828c1d6d549647f43f6ac252cdb1f0906382d3b722d14ef41cb +MISC ChangeLog 1301 RMD160 5f2331e2d708e43b885fa76a5a67645749550b8e SHA1 4ecf51fccf6d1c48e47425da0586103858bce65e SHA256 5fc4fe9d05083cbe68f3b91859c9026497106f2d584f302da297e82bb7d21499 MISC metadata.xml 1123 RMD160 bd02b69a49c6cc8911b907d2e8aa549010307489 SHA1 6e1aa85ab0f8503c4e5984674902941eaea62fe4 SHA256 00ffac25f39f88ba62ba57b4a5e69539bc0dd74f35715fc6d144cab4c1fcce55 diff --git a/dev-games/mercator/files/mercator-0.2.7-gcc44.patch b/dev-games/mercator/files/mercator-0.2.7-gcc44.patch new file mode 100644 index 000000000000..5711cbff826d --- /dev/null +++ b/dev-games/mercator/files/mercator-0.2.7-gcc44.patch @@ -0,0 +1,10 @@ +--- tests/testTerrain.cpp.old 2009-06-10 09:57:27.000000000 +0200 ++++ tests/testTerrain.cpp 2009-06-10 09:57:52.000000000 +0200 +@@ -7,6 +7,7 @@ + #include <Mercator/FillShader.h> + + #include <iostream> ++#include <cstdlib> + + int main() + { diff --git a/dev-games/mercator/mercator-0.2.7.ebuild b/dev-games/mercator/mercator-0.2.7.ebuild index 07b2fe60461b..5e7e594365d1 100644 --- a/dev-games/mercator/mercator-0.2.7.ebuild +++ b/dev-games/mercator/mercator-0.2.7.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.2.7.ebuild,v 1.1 2009/06/05 13:12:25 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.2.7.ebuild,v 1.2 2009/06/10 08:02:38 tupone Exp $ EAPI=2 +inherit eutils + DESCRIPTION="WorldForge library primarily aimed at terrain." HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/mercator" SRC_URI="mirror://sourceforge/worldforge/${P}.tar.gz" @@ -12,10 +14,14 @@ KEYWORDS="~amd64 ~x86" IUSE="doc" SLOT="0" -RDEPEND=">=dev-games/wfmath-0.3.2" +RDEPEND="dev-games/wfmath" DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc44.patch +} + src_compile() { emake || die "make failed" if use doc; then |