diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch')
| -rw-r--r-- | games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch new file mode 100644 index 000000000000..fca1efb5891a --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch @@ -0,0 +1,35 @@ +From https://bugs.gentoo.org/show_bug.cgi?id=538580 + +Works around this build failure: + +In file included from src/AICastor.cpp:26:0: +src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)': +src/Game.h:152:9: error: 'struct Game::BuildProject' is private + struct BuildProject + ^ +src/AICastor.cpp:2296:23: error: within this context + for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++) + ^ +scons: *** [src/AICastor.o] Error 1 +scons: building terminated because of errors. + +patch submitted by zimous + +--- glob2-0.9.4.4.orig/src/Game.h ++++ glob2-0.9.4.4/src/Game.h +@@ -149,6 +149,7 @@ + BOTTOM_TO_TOP + }; + ++public: + struct BuildProject + { + int posX; +@@ -159,6 +160,7 @@ + int unitWorkingFuture; + }; + ++private: + ///Initiates Game + void init(GameGUI *gui, MapEdit* edit); + |