diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2008-04-15 21:39:33 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2008-04-15 21:39:33 +0000 |
| commit | 03bb04a4434e1c0abc0794f52438dccb216b7783 (patch) | |
| tree | f1aa1d6cf56fd3cc837b08f8afa6b54d7cc35fe7 /dev-games | |
| parent | Improved ebuild, proposed in bug 217850. Depend changed to include split Qt. ... (diff) | |
| download | gentoo-2-03bb04a4434e1c0abc0794f52438dccb216b7783.tar.gz gentoo-2-03bb04a4434e1c0abc0794f52438dccb216b7783.tar.bz2 gentoo-2-03bb04a4434e1c0abc0794f52438dccb216b7783.zip | |
Fix compilation for gcc-4.3 Bug #217626
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/mercator/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/mercator/files/mercator-0.2.5-gcc43.patch | 31 | ||||
| -rw-r--r-- | dev-games/mercator/mercator-0.2.5.ebuild | 10 |
3 files changed, 45 insertions, 4 deletions
diff --git a/dev-games/mercator/ChangeLog b/dev-games/mercator/ChangeLog index 749ef8e0b46b..26b1c584312b 100644 --- a/dev-games/mercator/ChangeLog +++ b/dev-games/mercator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/mercator -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.2 2007/05/07 22:02:28 tupone Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.3 2008/04/15 21:39:32 tupone Exp $ + + 15 Apr 2008; Tupone Alfredo <tupone@gentoo.org> + +files/mercator-0.2.5-gcc43.patch, mercator-0.2.5.ebuild: + Fix compilation for gcc-4.3 Bug #217626 by Peter Alfredsen 07 May 2007; Tupone Alfredo <tupone@gentoo.org> mercator-0.2.5.ebuild: Added ~amd64 keyword diff --git a/dev-games/mercator/files/mercator-0.2.5-gcc43.patch b/dev-games/mercator/files/mercator-0.2.5-gcc43.patch new file mode 100644 index 000000000000..f4e3248b1923 --- /dev/null +++ b/dev-games/mercator/files/mercator-0.2.5-gcc43.patch @@ -0,0 +1,31 @@ +--- Mercator/RandCache.h.old 2008-04-15 23:17:48.000000000 +0200 ++++ Mercator/RandCache.h 2008-04-15 23:18:38.000000000 +0200 +@@ -6,6 +6,7 @@ + #define MERCATOR_RANDCACHE_H + + #include <vector> ++#include <cstdlib> + #include <wfmath/MersenneTwister.h> + + // construct with something like: +--- Mercator/AreaShader.cpp.old 2008-04-15 23:19:04.000000000 +0200 ++++ Mercator/AreaShader.cpp 2008-04-15 23:21:06.000000000 +0200 +@@ -12,6 +12,7 @@ + #include "Mercator/Segment.h" + #include "Mercator/Surface.h" + ++#include <algorithm> + #include <set> + #include <iostream> + +--- Mercator/AreaShader.h.old 2008-04-15 23:19:53.000000000 +0200 ++++ Mercator/AreaShader.h 2008-04-15 23:20:19.000000000 +0200 +@@ -22,7 +22,7 @@ + virtual bool checkIntersect(const Segment &) const; + private: + /// helper to shader a single area into the surface +- void shadeArea(Surface& s, const Area* const s) const; ++ void shadeArea(Surface& s, const Area* const ar) const; + + int m_layer; + }; diff --git a/dev-games/mercator/mercator-0.2.5.ebuild b/dev-games/mercator/mercator-0.2.5.ebuild index 286bc4e34b7b..318a7de64b84 100644 --- a/dev-games/mercator/mercator-0.2.5.ebuild +++ b/dev-games/mercator/mercator-0.2.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.2.5.ebuild,v 1.2 2007/05/07 22:02:28 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.2.5.ebuild,v 1.3 2008/04/15 21:39:32 tupone Exp $ inherit eutils @@ -17,6 +17,12 @@ RDEPEND=">=dev-games/wfmath-0.3.2" DEPEND="${REDEPEND} dev-util/pkgconfig" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc43.patch +} + src_compile() { econf || die "econf failed" emake || die "make failed" |