| 1 |
commit: de2f62f96c9bd3b866d2805fdc3d75212a7b7b17 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 2 14:20:12 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 14:20:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2f62f9 |
| 7 |
|
| 8 |
games-arcade/bloboats: Add build fix for gcc-6, bug 598690 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/598690 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
games-arcade/bloboats/bloboats-1.0.2.ebuild | 3 ++- |
| 14 |
games-arcade/bloboats/files/bloboats-1.0.2-gcc6.patch | 12 ++++++++++++ |
| 15 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/games-arcade/bloboats/bloboats-1.0.2.ebuild b/games-arcade/bloboats/bloboats-1.0.2.ebuild |
| 18 |
index 0c138da1f23..579487f2cdf 100644 |
| 19 |
--- a/games-arcade/bloboats/bloboats-1.0.2.ebuild |
| 20 |
+++ b/games-arcade/bloboats/bloboats-1.0.2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=5 |
| 27 |
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}" |
| 28 |
|
| 29 |
src_prepare() { |
| 30 |
epatch "${FILESDIR}"/${P}-warnings.patch |
| 31 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
| 32 |
sed -i \ |
| 33 |
-e "/PREFIX/s://:${D}:" \ |
| 34 |
-e "/DATADIR/s:/usr/games/bloboats/data:${GAMES_DATADIR}/${PN}:" \ |
| 35 |
|
| 36 |
diff --git a/games-arcade/bloboats/files/bloboats-1.0.2-gcc6.patch b/games-arcade/bloboats/files/bloboats-1.0.2-gcc6.patch |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..e0af90f19cc |
| 39 |
--- /dev/null |
| 40 |
+++ b/games-arcade/bloboats/files/bloboats-1.0.2-gcc6.patch |
| 41 |
@@ -0,0 +1,12 @@ |
| 42 |
+diff -ruN --strip-trailing-cr bloboats-1.0.2.orig/src/menu.cpp bloboats-1.0.2/src/menu.cpp |
| 43 |
+--- bloboats-1.0.2.orig/src/menu.cpp 2010-08-25 23:55:26.000000000 +0200 |
| 44 |
++++ bloboats-1.0.2/src/menu.cpp 2017-10-02 16:09:23.398499565 +0200 |
| 45 |
+@@ -917,7 +917,7 @@ |
| 46 |
+ exit(1); |
| 47 |
+ } |
| 48 |
+ |
| 49 |
+- ghostfile=false; |
| 50 |
++ ghostfile=NULL; |
| 51 |
+ ghost=false; |
| 52 |
+ } else { |
| 53 |
+ Uint32 ghostlevel = 0; |
Archives