games-arcade/insaneodyssey: Fix building with GCC-6
authorPeter Levine <plevine457@gmail.com>
Tue, 1 Aug 2017 02:01:10 +0000 (22:01 -0400)
committerDavid Seifert <soap@gentoo.org>
Sun, 13 Aug 2017 11:08:45 +0000 (13:08 +0200)
Bug: https://bugs.gentoo.org/show_bug.cgi?id=600894
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5263

games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch [new file with mode: 0644]
games-arcade/insaneodyssey/insaneodyssey-000311.ebuild

diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
new file mode 100644 (file)
index 0000000..74b4bf6
--- /dev/null
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/600894
+
+--- a/insaneodyssey/io.cpp
++++ b/insaneodyssey/io.cpp
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <cmath>
+ #include <SDL/SDL.h>
+@@ -894,7 +895,7 @@
+       else
+       {       
+          if ( jumping )
+-            yspeed = -jumpheight - abs(xspeed)/4;
++            yspeed = -jumpheight - std::abs(xspeed)/4;
+       }
+       short TempX = (x + width/2) / TILESIZE;
index 2963941b7267da52bb30d79d6f2c0fe381891194..74763f4692e3aeb0e304c97991536607fd8e75c5 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,9 @@ src_prepare() {
                "${FILESDIR}"/${P}-datafiles.patch > "${T}"/datafiles.patch \
                || die
                epatch "${T}"/datafiles.patch
+
+       epatch "${FILESDIR}"/${P}-gcc6.patch
+
        sed -i \
                -e "/lvl/s:^:${GAMES_DATADIR}/${PN}/:" \
                -e "s:night:${GAMES_DATADIR}/${PN}/night:" \