games-board/pouetchess: Fix building with GCC-6
authorPeter-Levine <plevine457@gmail.com>
Tue, 21 Mar 2017 22:08:42 +0000 (18:08 -0400)
committerDavid Seifert <soap@gentoo.org>
Sat, 25 Mar 2017 12:47:59 +0000 (13:47 +0100)
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

games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch [new file with mode: 0644]
games-board/pouetchess/pouetchess-0.2.0-r1.ebuild

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 (file)
index 0000000..4853eee
--- /dev/null
@@ -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;\r
+ }\r
\r
++// Not used anywhere and conflicts with C++11 std::round(float)\r
++#if __cplusplus < 201103L\r
+ inline int round(float f)\r
+ {\r
+   return int(f + 0.5f);\r
+ }\r
++#endif\r
\r
+ inline float getNextRandom(){\r
+   return (float)rand()/(RAND_MAX + 1);\r
index fd5a950149b05c420e5b49325f04a60452426523..5858f138eaf966b2ce533559c66e830e7e00ef57 100644 (file)
@@ -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]:" \