summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter-Levine <plevine457@gmail.com>2017-04-05 02:47:06 -0400
committerDavid Seifert <soap@gentoo.org>2017-04-16 20:57:32 +0200
commit9d3eced5d6a26a6eca1fc9aa8f0ac9222128fa7e (patch)
treedd0f192db909735f61c104451da1e0af7c58537f /games-action/clanbomber
parentnet-im/vacuum: Fix building with GCC-6 (bug #614084) (diff)
downloadgentoo-9d3eced5d6a26a6eca1fc9aa8f0ac9222128fa7e.tar.gz
gentoo-9d3eced5d6a26a6eca1fc9aa8f0ac9222128fa7e.tar.bz2
gentoo-9d3eced5d6a26a6eca1fc9aa8f0ac9222128fa7e.zip
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
Diffstat (limited to 'games-action/clanbomber')
-rw-r--r--games-action/clanbomber/clanbomber-2.1.1-r1.ebuild1
-rw-r--r--games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch19
2 files changed, 20 insertions, 0 deletions
diff --git a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
index 7fbbd88aa00a..eee357249b52 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 000000000000..714e9de85fa2
--- /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;