From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../glob2/files/glob2-0.9.4.4-gcc44.patch | 12 ++++++++ .../glob2/files/glob2-0.9.4.4-gcc49.patch | 35 ++++++++++++++++++++++ .../glob2/files/glob2-0.9.4.4-scons-blows.patch | 26 ++++++++++++++++ .../glob2/files/glob2-0.9.4.4-underlinking.patch | 19 ++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch create mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch create mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch create mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch (limited to 'games-strategy/glob2/files') diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch new file mode 100644 index 000000000000..5ce62ea6e46c --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch @@ -0,0 +1,12 @@ +--- libgag/include/StreamBackend.h.old ++++ libgag/include/StreamBackend.h +@@ -28,6 +28,9 @@ + #ifdef putc + #undef putc + #endif ++#ifdef getc ++#undef getc ++#endif + + namespace GAGCore + { 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::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); + diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch new file mode 100644 index 000000000000..70619f04839d --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch @@ -0,0 +1,26 @@ +--- SConstruct.orig ++++ SConstruct +@@ -1,6 +1,7 @@ + EnsureSConsVersion(0, 96, 92) + import sys + import os ++import SCons.Util + import glob + sys.path.append( os.path.abspath("scons") ) + import bundle +@@ -268,6 +269,15 @@ + env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz" + env["TARFLAGS"] = "-c -z" + env.Alias("dist", env["TARFILE"]) ++ # Using suggestions for http://dev.gentoo.org/~vapier/scons-blows.txt ++ if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++ if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] ++ if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) ++ if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + + def PackTar(target, source): + if "dist" in COMMAND_LINE_TARGETS: diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch new file mode 100644 index 000000000000..65eba48717db --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch @@ -0,0 +1,19 @@ +--- glob2-0.9.4.4.orig/SConstruct ++++ glob2-0.9.4.4/SConstruct +@@ -110,6 +110,16 @@ + print "Could not find libz or zlib1.dll" + missing.append("zlib") + ++ boost_system = '' ++ if conf.CheckLib("boost_system"): ++ boost_system="boost_system" ++ elif conf.CheckLib("boost_system-mt"): ++ boost_system="boost_system-mt" ++ else: ++ print "Could not find libboost_system or libboost_system-mt" ++ missing.append("libboost_system") ++ env.Append(LIBS=[boost_system]) ++ + boost_thread = '' + if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): + boost_thread="boost_thread" -- cgit v1.2.3-65-gdbad