summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-04-24 02:01:31 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-04-24 02:01:31 +0000
commita4d31dedadb0a58f47b7aa1b137d72027cce8ab0 (patch)
treefcf75e85a879ffdd26df3f731834ec1e5b5da2a0 /games-puzzle/fish-fillets
parentwhitespace (diff)
downloadgentoo-2-a4d31dedadb0a58f47b7aa1b137d72027cce8ab0.tar.gz
gentoo-2-a4d31dedadb0a58f47b7aa1b137d72027cce8ab0.tar.bz2
gentoo-2-a4d31dedadb0a58f47b7aa1b137d72027cce8ab0.zip
add patch for building with gcc-4.3 submitted by Martin Väth via bug #218954
(Portage version: 2.1.4.4)
Diffstat (limited to 'games-puzzle/fish-fillets')
-rw-r--r--games-puzzle/fish-fillets/ChangeLog7
-rw-r--r--games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch32
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild8
3 files changed, 45 insertions, 2 deletions
diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 011aa5a6e99d..6a626a789f9b 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-puzzle/fish-fillets
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.28 2008/03/06 17:08:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.29 2008/04/24 02:01:31 mr_bones_ Exp $
+
+ 24 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/fish-fillets-0.8.0-gcc43.patch, fish-fillets-0.8.0.ebuild:
+ add patch for building with gcc-4.3 submitted by Martin Väth via bug
+ #218954
29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> fish-fillets-0.7.4.ebuild:
Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch
new file mode 100644
index 000000000000..b81f207aa3bf
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.8.0-gcc43.patch
@@ -0,0 +1,32 @@
+--- src/gengine/OptionAgent.cpp
++++ src/gengine/OptionAgent.cpp
+@@ -23,7 +23,8 @@
+ #include "UnknownMsgException.h"
+ #include "minmax.h"
+
+-#include <string.h> //strlen
++#include <cstring> //strlen
++#include <cstdlib>
+ #include <locale.h> //setlocale
+
+ #ifndef LC_MESSAGES
+--- src/gengine/StringTool.cpp
++++ src/gengine/StringTool.cpp
+@@ -9,6 +9,7 @@
+ #include "StringTool.h"
+
+ #include <sstream>
++#include <cstdlib>
+
+ //-----------------------------------------------------------------
+ /**
+--- src/level/Landslip.cpp
++++ src/level/Landslip.cpp
+@@ -10,6 +10,7 @@
+
+ #include "Rules.h"
+ #include "minmax.h"
++#include <cstring>
+
+ //-----------------------------------------------------------------
+ Landslip::Landslip(const ModelList &models)
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
index 698ae43eff3f..6ce9cb3e70ed 100644
--- a/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild,v 1.2 2008/01/18 02:56:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.0.ebuild,v 1.3 2008/04/24 02:01:31 mr_bones_ Exp $
inherit eutils games
@@ -26,6 +26,12 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/fillets-ng-${PV}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
src_compile() {
egamesconf \
--datadir="${GAMES_DATADIR}/${PN}" \