[gentoo-commits] repo/gentoo:master commit in: games-action/clanbomber/files/, games-action/clanbomber/

[David Seifert]

commit:     9d3eced5d6a26a6eca1fc9aa8f0ac9222128fa7e
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Wed Apr  5 06:47:06 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 18:57:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3eced5

games-action/clanbomber: Fix building with GCC-6 (bug #613332)

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4311

 games-action/clanbomber/clanbomber-2.1.1-r1.ebuild    |  1 +
 .../clanbomber/files/clanbomber-2.1.1-gcc6.patch      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
index 7fbbd88aa00..eee357249b5 100644
--- a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
@@ -29,6 +29,7 @@ DOCS=( AUTHORS ChangeLog ChangeLog.hg IDEAS NEWS QUOTES README TODO )
 PATCHES=(
 		"${FILESDIR}"/${P}-automake112.patch
 		"${FILESDIR}"/${P}-boost150.patch
+		"${FILESDIR}"/${P}-gcc6.patch
 )
 
 src_prepare() {

diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch b/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
new file mode 100644
index 00000000000..714e9de85fa
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
@@ -0,0 +1,19 @@
+--- a/src/Credits.h
++++ b/src/Credits.h
+@@ -47,7 +47,7 @@
+ 	int   speed;
+ 	bool  stopped;
+  private:
+-	static const float yoffset_start = 50;
++	static const float yoffset_start;
+ 	static const int normal_speed = 40;
+ 	static const int text_height = 40;
+ 	
+--- a/src/Credits.cpp
++++ b/src/Credits.cpp
+@@ -273,3 +273,5 @@
+       (*draw_list_iter)->show();
+     }
+ }
++
++const float Credits::yoffset_start = 50;