summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-strategy/glob2/Manifest1
-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
-rw-r--r--games-strategy/glob2/glob2-0.9.4.4-r2.ebuild64
-rw-r--r--games-strategy/glob2/metadata.xml15
-rw-r--r--profiles/package.mask1
9 files changed, 0 insertions, 222 deletions
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
deleted file mode 100644
index f5f41806f2a..00000000000
--- a/games-strategy/glob2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca
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"
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
deleted file mode 100644
index fe7cdc7b172..00000000000
--- a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils scons-utils
-
-DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
-HOMEPAGE="http://globulation2.org/"
-SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/boost-1.34[threads]
- dev-libs/fribidi
- media-libs/libsdl[opengl]
- media-libs/libvorbis
- media-libs/sdl-image[png]
- media-libs/sdl-net
- media-libs/sdl-ttf
- media-libs/speex
- virtual/glu
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch )
-
-src_configure() {
- myesconsargs=(
- INSTALLDIR=/usr/share/${PN}
- DATADIR=/usr/share/${PN}
- )
- escons data
-}
-
-src_compile() {
- escons
-}
-
-src_install() {
- dobin src/${PN}
- insinto /usr/share/${PN}
- doins -r campaigns data maps scripts
- find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' +
- newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
- make_desktop_entry glob2 "Globulation 2"
- einstalldocs
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml
deleted file mode 100644
index 181fc4eec53..00000000000
--- a/games-strategy/glob2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Globulation2 is an innovative high quality Real-Time Strategy [RTS],
-which minimizes micro-management by automatically assigning tasks to
-the units. The player has to choose the number of units he wants for
-the different tasks, and the units will do their best to satisfy the
-requests. This allows to manage more units and to focus on strategies.
-</longdescription>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index fad43785166..63d6bfc9d0c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -264,7 +264,6 @@ games-action/btanks
games-emulation/gambatte
games-sports/vdrift
games-strategy/endless-sky
-games-strategy/glob2
# Michał Górny <mgorny@gentoo.org> (2020-09-25)
# PyPy3.7 alpha. Known to break a few packages. Masked until it