From c36c2dc1b2e0d63b6b953528b91b63b848819bf8 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Fri, 23 Jun 2017 10:53:54 +0200
Subject: [PATCH] games/glob2: Patch for the newer gccs.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 games/glob2/c++14.patch      | 46 ++++++++++++++++++++++++++++++++++++
 games/glob2/glob2.SlackBuild |  3 +++
 2 files changed, 49 insertions(+)
 create mode 100644 games/glob2/c++14.patch

diff --git a/games/glob2/c++14.patch b/games/glob2/c++14.patch
new file mode 100644
index 0000000000..6465f659af
--- /dev/null
+++ b/games/glob2/c++14.patch
@@ -0,0 +1,46 @@
+# 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/glob2/glob2.SlackBuild b/games/glob2/glob2.SlackBuild
index 6bb719cd26..435af508ff 100644
--- a/games/glob2/glob2.SlackBuild
+++ b/games/glob2/glob2.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
 
 patch -p1 < $CWD/fixes.patch
 
+# From upstream
+patch -p1 < $CWD/c++14.patch
+
 mkdir -p $PKG/usr/bin \
          $PKG/usr/share/games/$PRGNAM