diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-02-27 21:12:27 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-02-27 21:12:27 +0000 |
| commit | eaddf143b337c498c5bb501b2f49858d98d44be6 (patch) | |
| tree | 223367375a605747a139131311a95e73e222ee80 /dev-games | |
| parent | Require newer icu because of bug 396421 (diff) | |
| download | gentoo-2-eaddf143b337c498c5bb501b2f49858d98d44be6.tar.gz gentoo-2-eaddf143b337c498c5bb501b2f49858d98d44be6.tar.bz2 gentoo-2-eaddf143b337c498c5bb501b2f49858d98d44be6.zip | |
Fix cyphesis build. Bug #405863
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/mercator/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/mercator/files/mercator-0.3.0-gentoo.patch | 11 | ||||
| -rw-r--r-- | dev-games/mercator/mercator-0.3.0.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-games/mercator/ChangeLog b/dev-games/mercator/ChangeLog index 866257224520..0e60b25e79f7 100644 --- a/dev-games/mercator/ChangeLog +++ b/dev-games/mercator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/mercator # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.20 2012/02/24 15:25:35 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/ChangeLog,v 1.21 2012/02/27 21:12:27 tupone Exp $ + + 27 Feb 2012; Tupone Alfredo <tupone@gentoo.org> mercator-0.3.0.ebuild, + +files/mercator-0.3.0-gentoo.patch: + Fix cyphesis build. Bug #405863 by Patrick Lauer 24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> mercator-0.3.0.ebuild: x86 stable wrt bug #403959 diff --git a/dev-games/mercator/files/mercator-0.3.0-gentoo.patch b/dev-games/mercator/files/mercator-0.3.0-gentoo.patch new file mode 100644 index 000000000000..2693fa8e4fdc --- /dev/null +++ b/dev-games/mercator/files/mercator-0.3.0-gentoo.patch @@ -0,0 +1,11 @@ +--- Mercator/TerrainMod.cpp.old 2012-02-26 21:30:39.000000000 +0100 ++++ Mercator/TerrainMod.cpp 2012-02-26 21:29:58.000000000 +0100 +@@ -40,6 +40,8 @@ + s.removeMod(this); + } + ++template class ShapeTerrainMod<WFMath::Polygon >; ++ + template class LevelTerrainMod<WFMath::Ball >; + template class LevelTerrainMod<WFMath::Polygon >; + template class LevelTerrainMod<WFMath::RotBox >; diff --git a/dev-games/mercator/mercator-0.3.0.ebuild b/dev-games/mercator/mercator-0.3.0.ebuild index 3546ce5021d5..fba1fa358c9a 100644 --- a/dev-games/mercator/mercator-0.3.0.ebuild +++ b/dev-games/mercator/mercator-0.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.3.0.ebuild,v 1.5 2012/02/24 15:25:35 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.3.0.ebuild,v 1.6 2012/02/27 21:12:27 tupone Exp $ EAPI=2 inherit base @@ -20,6 +20,7 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS README TODO ) +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { base_src_compile |