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 | ad5f023c7301057f90a42bef07204950e3ae1359 (patch) | |
| tree | 58a2c2f211f77ab1ec56adb5674e90569497021b /dev-games/mercator | |
| parent | Improved ebuild, proposed in bug 217850. Depend changed to include split Qt. ... (diff) | |
| download | historical-ad5f023c7301057f90a42bef07204950e3ae1359.tar.gz historical-ad5f023c7301057f90a42bef07204950e3ae1359.tar.bz2 historical-ad5f023c7301057f90a42bef07204950e3ae1359.zip | |
Fix compilation for gcc-4.3 Bug #217626
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-games/mercator')
| -rw-r--r-- | dev-games/mercator/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/mercator/Manifest | 15 | ||||
| -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 |
4 files changed, 58 insertions, 6 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/Manifest b/dev-games/mercator/Manifest index d683f1635839..6f8ed01c42f1 100644 --- a/dev-games/mercator/Manifest +++ b/dev-games/mercator/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX mercator-0.2.5-gcc43.patch 981 RMD160 429490f7ccdc3cd5dfa7c6ea5652cfc116034224 SHA1 71ff103e8291c0a2fa70b1b27d6d5a150fced4c8 SHA256 999d252c693285f4cf86aa799faa0ec8b966476296d0a6562efe6f9744fcdf68 DIST mercator-0.2.5.tar.gz 376764 RMD160 7534a851f2eb546a1f1323a543a4cec08ab33673 SHA1 8275f44df892e4fa30b89f599b38e908a7400c20 SHA256 3b7de6d9028cf1ea2c9b3ee9d9dc13982a54e16d8c16871e81f2602c1fe16a53 -EBUILD mercator-0.2.5.ebuild 914 RMD160 922e4e04de54110d33ba551a2f1f87595354490f SHA1 e90933474f4b650898b688abd0448e0f1c8bba87 SHA256 3f3bab090d8f9ec5eabe748c03cf258b90fbc3ae69f929818bfcd9288e4d9eaf -MISC ChangeLog 465 RMD160 85df4f40a7c4a60b1160e0ac490a7788421dc5a1 SHA1 0e2af7b5b76956a99d15a29e8d3e7a1214fa65bc SHA256 f2140e5ad2f3ee55ace9577b34e0d3f7401a7ed006e204c148ec65545813ac5a +EBUILD mercator-0.2.5.ebuild 995 RMD160 8de9b8fd96b93278dc6857fffa37b53a2ed71398 SHA1 3d862b5d3320fb65c76c12839532c51e94094640 SHA256 7ea7f2070e4516c20c6f28fc4763cd3630a1faf510b129eac8978fe927ec775a +MISC ChangeLog 637 RMD160 3da94d062bbb1da4ae5d295277298a360e443de0 SHA1 a876b46aaf10d71c9cdd30fe6216a64cf5b9c07e SHA256 c8176e7e3f8bda3ffbc7688c719e1c6d8ca8128fdfb3723f765fdb08b9494771 MISC metadata.xml 1123 RMD160 bd02b69a49c6cc8911b907d2e8aa549010307489 SHA1 6e1aa85ab0f8503c4e5984674902941eaea62fe4 SHA256 00ffac25f39f88ba62ba57b4a5e69539bc0dd74f35715fc6d144cab4c1fcce55 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFIBSCeVrx5UrvSjscRAltKAJ0eIs6efdpzeUe11sB5XQn89VeQrwCgg7w5 +GyIVI7T7mIh+Q9WTf4YUnOU= +=CZ5M +-----END PGP SIGNATURE----- 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" |