summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-10-26 08:29:55 +0100
committerMichał Górny <mgorny@gentoo.org>2020-10-26 08:38:56 +0100
commit3e8ec1262d16c7ce12b1dfb785e0339602a6f5f8 (patch)
tree25a56480ba8cec04ade0ca96d8c50f7d485f0769 /games-strategy/glob2/files
parentnet-vpn/freelan: Remove last-rited pkg (diff)
downloadgentoo-3e8ec1262d16c7ce12b1dfb785e0339602a6f5f8.tar.gz
gentoo-3e8ec1262d16c7ce12b1dfb785e0339602a6f5f8.tar.bz2
gentoo-3e8ec1262d16c7ce12b1dfb785e0339602a6f5f8.zip
games-strategy/glob2: Remove last-rited pkg
Closes: https://bugs.gentoo.org/735544 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'games-strategy/glob2/files')
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch12
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch35
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch49
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch26
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch19
5 files changed, 0 insertions, 141 deletions
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
deleted file mode 100644
index 8d2da78cee2..00000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libgag/include/StreamBackend.h.old
-+++ b/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
deleted file mode 100644
index fca1efb5891..00000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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);
-
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
deleted file mode 100644
index f1152c3ba1c..00000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Bug: https://bugs.gentoo.org/610382
-Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
-
-# HG changeset patch
-# User Jonathan Wakely <jwakely@redhat.com>
-# Date 1485875296 0
-# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
-# Parent c4da01699846179d8bf21e8dae2b973158ec0775
-Fix last argument to ChooseMapScreen constructor
-
-Since C++14 'false' is not a valid null pointer constant, so cannot be passed
-to functions expecting pointer arguments.
-
-diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp
---- a/src/EditorMainMenu.cpp
-+++ b/src/EditorMainMenu.cpp
-@@ -90,7 +90,7 @@
- }
- else if (par1==LOADMAP)
- {
-- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false);
-+ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL);
- int rc=chooseMapScreen.execute(globalContainer->gfx, 40);
- if (rc==ChooseMapScreen::OK)
- {
-diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
---- a/src/LANMenuScreen.cpp
-+++ b/src/LANMenuScreen.cpp
-@@ -62,7 +62,7 @@
- }
- else if(par1 == HOST)
- {
-- ChooseMapScreen cms("maps", "map", false, "games", "game", false);
-+ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
- int rc = cms.execute(globalContainer->gfx, 40);
- if(rc == ChooseMapScreen::OK)
- {
-diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp
---- a/src/YOGClientLobbyScreen.cpp
-+++ b/src/YOGClientLobbyScreen.cpp
-@@ -326,7 +326,7 @@
-
- void YOGClientLobbyScreen::hostGame()
- {
-- ChooseMapScreen cms("maps", "map", false, "games", "game", false);
-+ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
- int rc = cms.execute(globalContainer->gfx, 40);
- if(rc == ChooseMapScreen::OK)
- {
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
deleted file mode 100644
index b3e6e86eb48..00000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/SConstruct.orig
-+++ b/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 https://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
deleted file mode 100644
index 65eba48717d..00000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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"