gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-strategy/glob2: Fix building with GCC-6

Browse Source 
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610382
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5189
This commit is contained in:
Peter Levine
2017-07-23 23:43:51 -04:00
committed by David Seifert
parent b0d6d93eed
commit 3d3a1f91e9
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch Normal file
View File

@@ -0,0 +1,49 @@
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)
{

4
games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking,gcc49}.patch
epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch
}
src_configure() {