gcc4 patch from vapier to fix bug #136252

(Portage version: 2.1.2_pre1)

3 files changed, 71 insertions, 4 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 011b3c7186b6..30ebbb216afb 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/fish-fillets
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.19 2006/08/15 14:59:16 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.20 2006/09/20 07:37:57 mr_bones_ Exp $
+
+  20 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/fish-fillets-0.7.3-gcc4.patch, fish-fillets-0.7.3.ebuild:
+  gcc4 patch from vapier to fix bug #136252
 
   15 Aug 2006; Thomas Cort <tcort@gentoo.org> fish-fillets-0.7.3.ebuild:
   Stable on amd64 wrt Bug #143961
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-gcc4.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-gcc4.patch
new file mode 100644
index 000000000000..3b215255721b
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-gcc4.patch
@@ -0,0 +1,56 @@
+--- configure.in
++++ configure.in
+@@ -89,21 +89,31 @@ AC_CHECK_LIB([SDL_ttf], [TTF_OpenFont],
+ 
+ ###################################################
+ # Test X11
+-OLD_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+-AC_TRY_COMPILE([
+-    #include "SDL.h"
+-    #include "SDL_syswm.h"
+-    #include <X11/Xutil.h>
+-    ], [
+-    SDL_SysWMinfo info;
+-    info.subsystem = SDL_SYSWM_X11;
+-    ], [have_x11="yes"], [have_x11="no"])
+-CPPFLAGS="$OLD_CPPFLAGS"
+-if test "x$have_x11" = xyes; then
+-    AC_DEFINE(HAVE_X11)
++X_LIBS=""
++AC_ARG_WITH(X,
++	[AC_HELP_STRING([--with-x],[enable X window manager support [default=detect]])],
++	[with_x11=$withval],[with_x11="maybe"])
++if test "x$with_x11" != "xno" ; then
++	AC_CHECK_LIB([X11], [Xutf8TextListToTextProperty], [with_x11="yes"], [with_x11="no"])
++	if test "x$with_x11" != "xno" ; then
++		OLD_CPPFLAGS="$CPPFLAGS"
++		CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
++		AC_TRY_COMPILE([
++		    #include "SDL.h"
++		    #include "SDL_syswm.h"
++		    #include <X11/Xutil.h>
++		    ], [
++		    SDL_SysWMinfo info;
++		    info.subsystem = SDL_SYSWM_X11;
++		    ], [have_x11="yes"], [have_x11="no"])
++		CPPFLAGS="$OLD_CPPFLAGS"
++		if test "x$have_x11" = xyes; then
++		    AC_DEFINE(HAVE_X11)
++			X_LIBS="-lX11"
++		fi
++	fi
+ fi
+-
++AC_SUBST(X_LIBS)
+ 
+ ###################################################
+ # Test FriBidi
+--- src/game/Makefile.am
++++ src/game/Makefile.am
+@@ -18,4 +18,4 @@ ICON_LIBS =
+ endif
+ 
+ 
+-fillets_LDADD = $(ICON_LIBS) ../menu/libmenu.a ../level/liblevel.a ../state/libstate.a ../option/liboption.a ../plan/libplan.a ../widget/libwidget.a ../effect/libeffect.a ../gengine/libgengine.a $(SDL_GFX_LIBS) $(SDL_LIBS) $(LUA_LIBS) $(BOOST_LIBS) $(FRIBIDI_LIBS)
++fillets_LDADD = $(ICON_LIBS) ../menu/libmenu.a ../level/liblevel.a ../state/libstate.a ../option/liboption.a ../plan/libplan.a ../widget/libwidget.a ../effect/libeffect.a ../gengine/libgengine.a $(SDL_GFX_LIBS) $(SDL_LIBS) $(LUA_LIBS) $(BOOST_LIBS) $(FRIBIDI_LIBS) $(X_LIBS)
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
index e03b0c913e79..9207523a0f3d 100644
--- a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.7.3.ebuild,v 1.2 2006/08/15 14:59:16 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild,v 1.3 2006/09/20 07:37:57 mr_bones_ Exp $
 
-inherit eutils games
+inherit autotools eutils games
 
 DATA_PV="0.7.1"
 DESCRIPTION="Underwater puzzle game - find a safe way out"
@@ -23,6 +23,13 @@ DEPEND=">=media-libs/libsdl-1.2
 
 S=${WORKDIR}/fillets-ng-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	eautoreconf
+}
+
 src_compile() {
 	CPPFLAGS="-DSYSTEM_DATA_DIR=\"\\\"${GAMES_DATADIR}/${PN}\\\"\"" \
 	egamesconf \
@@ -31,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	dodir "${GAMES_DATADIR}/${PN}"
 	cd ../fillets-ng-data-${DATA_PV}