summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-06-25 07:44:57 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-06-25 07:44:57 +0000
commitf350bfb7a95845495f503b75bc2dec5d039cd892 (patch)
treef48894213f47c3c012b8257a8ee7ea2733d84c68 /games-arcade
parentx86 stable, see bug 411507 (diff)
downloadgentoo-2-f350bfb7a95845495f503b75bc2dec5d039cd892.tar.gz
gentoo-2-f350bfb7a95845495f503b75bc2dec5d039cd892.tar.bz2
gentoo-2-f350bfb7a95845495f503b75bc2dec5d039cd892.zip
Fix overflow & asneeded Bug #423061
(Portage version: 2.1.11.1/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/fishsupper/ChangeLog7
-rw-r--r--games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch11
-rw-r--r--games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch11
-rw-r--r--games-arcade/fishsupper/fishsupper-0.1.6.ebuild10
4 files changed, 36 insertions, 3 deletions
diff --git a/games-arcade/fishsupper/ChangeLog b/games-arcade/fishsupper/ChangeLog
index 9035678bdce1..bf62335a2403 100644
--- a/games-arcade/fishsupper/ChangeLog
+++ b/games-arcade/fishsupper/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-arcade/fishsupper
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/ChangeLog,v 1.3 2012/02/24 14:34:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/ChangeLog,v 1.4 2012/06/25 07:44:57 tupone Exp $
+
+ 25 Jun 2012; Tupone Alfredo <tupone@gentoo.org> fishsupper-0.1.6.ebuild,
+ +files/fishsupper-0.1.6-asneeded.patch,
+ +files/fishsupper-0.1.6-ovflfix.patch:
+ Fix overflow & asneeded Bug #423061 by flameeyes@gentoo.org
24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> fishsupper-0.1.6.ebuild:
x86 stable wrt bug #404159
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
new file mode 100644
index 000000000000..2aba6f099e88
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.old 2012-06-24 18:47:58.947143638 +0200
++++ src/Makefile.am 2012-06-24 18:51:35.738921904 +0200
+@@ -1,7 +1,7 @@
+ AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
+ @SDL_CFLAGS@ \
+ -Wall
+-AM_LDFLAGS = @SDL_LIBS@
++LDADD = @SDL_LIBS@
+
+ bin_PROGRAMS = fishsupper
+
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
new file mode 100644
index 000000000000..4d5185dae7e9
--- /dev/null
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
@@ -0,0 +1,11 @@
+--- src/main.cpp.old 2012-06-24 18:35:27.661894094 +0200
++++ src/main.cpp 2012-06-24 18:35:41.041954632 +0200
+@@ -293,7 +293,7 @@
+
+ if (!ok)
+ {
+- fs_dir = new char[ strlen(".") ];
++ fs_dir = new char[ strlen(".") + 1];
+ strcpy(fs_dir, ".");
+ } // if ... else
+
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
index 2dbcf1eff30b..be5d5a7b2b7d 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/fishsupper-0.1.6.ebuild,v 1.3 2012/02/24 14:34:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/fishsupper/fishsupper-0.1.6.ebuild,v 1.4 2012/06/25 07:44:57 tupone Exp $
EAPI=2
-inherit eutils games
+inherit eutils autotools games
DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
HOMEPAGE="http://sourceforge.net/projects/fishsupper/"
@@ -21,6 +21,12 @@ RDEPEND="media-libs/libsdl[audio,video,opengl,X]
DEPEND="${RDEPEND}
dev-libs/boost"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ovflfix.patch \
+ "${FILESDIR}"/${P}-asneeded.patch
+ eautoreconf
+}
+
src_configure() {
egamesconf \
--disable-dependency-tracking