From b6dce8e5520aeb34b66435133d9e5488bae1492f Mon Sep 17 00:00:00 2001
From: Peter-Levine <plevine457@gmail.com>
Date: Tue, 21 Mar 2017 18:08:42 -0400
Subject: games-board/pouetchess: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=613428
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4278
---
 .../pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch   | 16 ++++++++++++++++
 games-board/pouetchess/pouetchess-0.2.0-r1.ebuild        |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch

(limited to 'games-board')

diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch b/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
new file mode 100644
index 000000000000..4853eee81e1d
--- /dev/null
+++ b/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
@@ -0,0 +1,16 @@
+--- pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h.old	2006-05-26 21:22:57.000000000 -0400
++++ pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h	2017-03-21 18:01:15.569181229 -0400
+@@ -27,10 +27,13 @@
+   return (x < min) ? min : (x > max) ? max : x;
+ }
+ 
++// Not used anywhere and conflicts with C++11 std::round(float)
++#if __cplusplus < 201103L
+ inline int round(float f)
+ {
+   return int(f + 0.5f);
+ }
++#endif
+ 
+ inline float getNextRandom(){
+   return (float)rand()/(RAND_MAX + 1);
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
index fd5a950149b0..5858f138eaf9 100644
--- a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
+++ b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-sconstruct-sandbox.patch" \
 		"${FILESDIR}/${P}-nvidia_glext.patch" \
 		"${FILESDIR}/${P}-segfaults.patch" \
-		"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-gcc43.patch" \
+		"${FILESDIR}/${P}-gcc6-cmath.patch"
 	# Fix for LibSDL >= 1.2.10 detection
 	sed -i \
 		-e "s:sdlver.split('.') >= \['1','2','8'\]:sdlver.split('.') >= [1,2,8]:" \
-- 
cgit v1.2.3-18-g5258