games-arcade/performous: Fix gcc-5 build. Bug #570572

Package-Manager: portage-2.2.26

diff --git a/games-arcade/performous/files/performous-1.0-gcc52.patch b/games-arcade/performous/files/performous-1.0-gcc52.patch
new file mode 100644 (file)
index 0000000..dc3eb6b
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-gcc52.patch
@@ -0,0 +1,11 @@
+--- game/songparser.hh.old     2016-04-19 21:57:29.594132735 +0200
++++ game/songparser.hh 2016-04-19 21:57:55.736682808 +0200
+@@ -33,7 +33,7 @@
+       Song& m_song;
+       std::stringstream m_ss;
+       unsigned int m_linenum;
+-      bool getline(std::string& line) { ++m_linenum; return std::getline(m_ss, line);}
++      bool getline(std::string& line) { ++m_linenum; return !std::getline(m_ss, line).fail();}
+       bool m_relative;
+       double m_gap;
+       double m_bpm;

diff --git a/games-arcade/performous/performous-1.0.ebuild b/games-arcade/performous/performous-1.0.ebuild
index ab277f8f3996737da255c77cd7c2898e8bb6d42f..9fa6cdf80dacac1290703e0a1c5d49ac32e3d169 100644 (file)
--- a/games-arcade/performous/performous-1.0.ebuild
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -61,6 +61,7 @@ src_prepare() {
                "${FILESDIR}"/${P}-libav.patch \
                "${FILESDIR}"/${P}-gentoo.patch \
                "${FILESDIR}"/${P}-linguas.patch \
+               "${FILESDIR}"/${P}-gcc52.patch \
                "${FILESDIR}"/${P}-include.patch
        sed -i \
                -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \