| 1 |
commit: 3d3a1f91e942cf0860471eb4d3d621612061a1f0 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jul 24 03:43:51 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 30 09:09:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3a1f91 |
| 7 |
|
| 8 |
games-strategy/glob2: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610382 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5189 |
| 13 |
|
| 14 |
.../glob2/files/glob2-0.9.4.4-gcc6.patch | 49 ++++++++++++++++++++++ |
| 15 |
games-strategy/glob2/glob2-0.9.4.4-r1.ebuild | 4 +- |
| 16 |
2 files changed, 51 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..f1152c3ba1c |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch |
| 23 |
@@ -0,0 +1,49 @@ |
| 24 |
+Bug: https://bugs.gentoo.org/610382 |
| 25 |
+Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a |
| 26 |
+ |
| 27 |
+# HG changeset patch |
| 28 |
+# User Jonathan Wakely <jwakely@××××××.com> |
| 29 |
+# Date 1485875296 0 |
| 30 |
+# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a |
| 31 |
+# Parent c4da01699846179d8bf21e8dae2b973158ec0775 |
| 32 |
+Fix last argument to ChooseMapScreen constructor |
| 33 |
+ |
| 34 |
+Since C++14 'false' is not a valid null pointer constant, so cannot be passed |
| 35 |
+to functions expecting pointer arguments. |
| 36 |
+ |
| 37 |
+diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp |
| 38 |
+--- a/src/EditorMainMenu.cpp |
| 39 |
++++ b/src/EditorMainMenu.cpp |
| 40 |
+@@ -90,7 +90,7 @@ |
| 41 |
+ } |
| 42 |
+ else if (par1==LOADMAP) |
| 43 |
+ { |
| 44 |
+- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false); |
| 45 |
++ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL); |
| 46 |
+ int rc=chooseMapScreen.execute(globalContainer->gfx, 40); |
| 47 |
+ if (rc==ChooseMapScreen::OK) |
| 48 |
+ { |
| 49 |
+diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp |
| 50 |
+--- a/src/LANMenuScreen.cpp |
| 51 |
++++ b/src/LANMenuScreen.cpp |
| 52 |
+@@ -62,7 +62,7 @@ |
| 53 |
+ } |
| 54 |
+ else if(par1 == HOST) |
| 55 |
+ { |
| 56 |
+- ChooseMapScreen cms("maps", "map", false, "games", "game", false); |
| 57 |
++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); |
| 58 |
+ int rc = cms.execute(globalContainer->gfx, 40); |
| 59 |
+ if(rc == ChooseMapScreen::OK) |
| 60 |
+ { |
| 61 |
+diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp |
| 62 |
+--- a/src/YOGClientLobbyScreen.cpp |
| 63 |
++++ b/src/YOGClientLobbyScreen.cpp |
| 64 |
+@@ -326,7 +326,7 @@ |
| 65 |
+ |
| 66 |
+ void YOGClientLobbyScreen::hostGame() |
| 67 |
+ { |
| 68 |
+- ChooseMapScreen cms("maps", "map", false, "games", "game", false); |
| 69 |
++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); |
| 70 |
+ int rc = cms.execute(globalContainer->gfx, 40); |
| 71 |
+ if(rc == ChooseMapScreen::OK) |
| 72 |
+ { |
| 73 |
|
| 74 |
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild |
| 75 |
index a99db31f446..3017798e40f 100644 |
| 76 |
--- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild |
| 77 |
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2015 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI=5 |
| 84 |
@@ -27,7 +27,7 @@ RDEPEND=" |
| 85 |
DEPEND="${RDEPEND}" |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
- epatch "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking,gcc49}.patch |
| 89 |
+ epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch |
| 90 |
} |
| 91 |
|
| 92 |
src_configure() { |
Archives