| 1 |
commit: be927cf2c7807684a49dd9790b738154d914bb33 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 23 02:27:54 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 30 09:09:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be927cf2 |
| 7 |
|
| 8 |
games-arcade/fishsupper: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610660 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5180 |
| 13 |
|
| 14 |
.../fishsupper/files/fishsupper-0.1.6-gcc6.patch | 49 ++++++++++++++++++++++ |
| 15 |
games-arcade/fishsupper/fishsupper-0.1.6.ebuild | 5 ++- |
| 16 |
2 files changed, 52 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..3ca63cb4a68 |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch |
| 23 |
@@ -0,0 +1,49 @@ |
| 24 |
+Bug: https://bugs.gentoo.org/610660 |
| 25 |
+ |
| 26 |
+--- a/src/Settings_screen.cpp |
| 27 |
++++ b/src/Settings_screen.cpp |
| 28 |
+@@ -217,3 +217,7 @@ |
| 29 |
+ |
| 30 |
+ // ************************************************** |
| 31 |
+ |
| 32 |
++const float FS::Settings_screen::bold = 1.0; |
| 33 |
++const float FS::Settings_screen::faded = 0.2; |
| 34 |
++ |
| 35 |
++// ************************************************** |
| 36 |
+--- a/src/Settings_screen.h |
| 37 |
++++ b/src/Settings_screen.h |
| 38 |
+@@ -71,8 +71,8 @@ |
| 39 |
+ static const int tick1_x = 252; |
| 40 |
+ static const int tick_y_offset = 33; |
| 41 |
+ static const int sprite_texture_start = FS_gfx::JOYSTICK; |
| 42 |
+- static const float bold = 1.0; |
| 43 |
+- static const float faded = 0.2; |
| 44 |
++ static const float bold; |
| 45 |
++ static const float faded; |
| 46 |
+ |
| 47 |
+ Settings* settings_ptr; |
| 48 |
+ int current_option; |
| 49 |
+--- a/src/Star_particle_system.cpp |
| 50 |
++++ b/src/Star_particle_system.cpp |
| 51 |
+@@ -137,6 +137,10 @@ |
| 52 |
+ } // FS::Star_particle_system::launch_new_star |
| 53 |
+ |
| 54 |
+ // ************************************************** |
| 55 |
++ |
| 56 |
++const float FS::Star_particle_system::lifespan = 1500.0; |
| 57 |
++ |
| 58 |
++// ************************************************** |
| 59 |
+ // ************************************************** |
| 60 |
+ // ************************************************** |
| 61 |
+ // ************************************************** |
| 62 |
+--- a/src/Star_particle_system.h |
| 63 |
++++ b/src/Star_particle_system.h |
| 64 |
+@@ -77,7 +77,7 @@ |
| 65 |
+ static const int STAR_WIDTH = 30; |
| 66 |
+ static const int STAR_HEIGHT = 30; |
| 67 |
+ // This is a float so that we get floating-point division in update. |
| 68 |
+- static const float lifespan = 1500.0; // in ms |
| 69 |
++ static const float lifespan; // in ms |
| 70 |
+ |
| 71 |
+ // A particle is basically a lightweight sprite. |
| 72 |
+ // Unlike a usual sprite, we don't need to worry about |
| 73 |
|
| 74 |
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild |
| 75 |
index ab2a7c88615..f8bd06bcde9 100644 |
| 76 |
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild |
| 77 |
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2015 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI=5 |
| 84 |
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND} |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
epatch "${FILESDIR}"/${P}-ovflfix.patch \ |
| 88 |
- "${FILESDIR}"/${P}-asneeded.patch |
| 89 |
+ "${FILESDIR}"/${P}-asneeded.patch \ |
| 90 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 91 |
eautoreconf |
| 92 |
} |
Archives