[gentoo-commits] repo/gentoo:master commit in: dev-games/mygui/, dev-games/mygui/files/

[Sergei Trofimovich]

commit:     f838d5aa1b2dd5952c018c125ed6b72bf71a70fe
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 10:18:04 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 10:18:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f838d5aa

dev-games/mygui: fix build on c++17 compiler (gcc-11)

Reported-by: lekto <AT> o2.pl
Closes: https://bugs.gentoo.org/732778
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-games/mygui/files/mygui-3.2.2-c++17.patch | 27 +++++++++++++++++++++++++++
 dev-games/mygui/mygui-3.2.2.ebuild            |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
new file mode 100644
index 00000000000..1cdf7babeb1
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
@@ -0,0 +1,27 @@
+https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch
+https://bugs.gentoo.org/732778
+
+Part of:
+
+From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001
+From: George Evmenov <george.evmenov@×××××.com>
+Date: Fri, 26 Jun 2015 12:25:26 +0300
+Subject: [PATCH] do not use nullptr define
+
+--- a/MyGUIEngine/include/MyGUI_Prerequest.h
++++ b/MyGUIEngine/include/MyGUI_Prerequest.h
+@@ -19,13 +19,7 @@
+ #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
+ 
+ #ifndef MYGUI_DONT_REPLACE_NULLPTR
+-#	if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
+-#		ifndef _MANAGED
+-#			ifndef _NATIVE_NULLPTR_SUPPORTED
+-#				define nullptr 0
+-#			endif
+-#		endif
+-#	else
++#	if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED)
+ #		define nullptr 0
+ #	endif
+ #endif

diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index ac582627a70..dc3766716fa 100644
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ b/dev-games/mygui/mygui-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-FHS.patch
+	"${FILESDIR}"/${P}-c++17.patch
 )
 
 pkg_setup() {