diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-03-23 10:18:31 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-03-23 10:18:31 +0000 |
| commit | dd9492837eba19f645e1202a7694749ce8aee9ff (patch) | |
| tree | 53fda5ae8509aaa82264a8d2990c8f3d3282e46a /games-arcade | |
| parent | Drop libunique dep again, #407645 (diff) | |
| download | gentoo-2-dd9492837eba19f645e1202a7694749ce8aee9ff.tar.gz gentoo-2-dd9492837eba19f645e1202a7694749ce8aee9ff.tar.bz2 gentoo-2-dd9492837eba19f645e1202a7694749ce8aee9ff.zip | |
Removing gtk usage from configure. Fix bug #409111
(Portage version: 2.1.10.50/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/sdl-sopwith/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.4-nogtk.patch | 42 | ||||
| -rw-r--r-- | games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild | 12 |
3 files changed, 57 insertions, 5 deletions
diff --git a/games-arcade/sdl-sopwith/ChangeLog b/games-arcade/sdl-sopwith/ChangeLog index b03d55154643..40ca13773fca 100644 --- a/games-arcade/sdl-sopwith/ChangeLog +++ b/games-arcade/sdl-sopwith/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/sdl-sopwith -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.14 2010/10/15 13:50:25 ranger Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.15 2012/03/23 10:18:31 tupone Exp $ + + 23 Mar 2012; Tupone Alfredo <tupone@gentoo.org> sdl-sopwith-1.7.4.ebuild, + +files/sdl-sopwith-1.7.4-nogtk.patch: + Removing gtk usage from configure. Fix bug #409111 by Piotr Szymaniak 15 Oct 2010; Brent Baude <ranger@gentoo.org> sdl-sopwith-1.7.4.ebuild: stable ppc, bug 340447 diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.4-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.4-nogtk.patch new file mode 100644 index 000000000000..f0e03ce8c1ed --- /dev/null +++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.4-nogtk.patch @@ -0,0 +1,42 @@ +--- configure.in.old 2012-03-22 21:48:13.392372372 +0100 ++++ configure.in 2012-03-22 21:48:27.373388004 +0100 +@@ -61,11 +61,6 @@ + SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl" + ],) + +-PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [ +- SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith" +- SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk" +-],) +- + AC_SUBST(SOPWITH_BINS) + AC_SUBST(SOPWITH_SUBDIRS) + +@@ -71,7 +71,7 @@ + + dnl check for TCPIP support + +-AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,) ++AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,) + + dnl generate Makefiles + +--- src/Makefile.am.old 2012-03-23 11:02:37.300326914 +0100 ++++ src/Makefile.am 2012-03-23 11:03:17.733470930 +0100 +@@ -6,7 +6,7 @@ + bin_PROGRAMS = @SOPWITH_BINS@ + EXTRA_PROGRAMS = sopwith gtksopwith psopwith + +-CFLAGS = @CFLAGS@ -I.. ++AM_CFLAGS = @SDL_CFLAGS@ -I.. + + COMMON_SRC = \ + video.h swcollsn.c swgames.h swmain.h swutil.h \ +--- src/sdl/Makefile.am.old 2012-03-23 11:04:40.819600680 +0100 ++++ src/sdl/Makefile.am 2012-03-23 11:05:07.303729600 +0100 +@@ -1,4 +1,4 @@ +-CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I.. ++AM_CFLAGS = @SDL_CFLAGS@ -I.. + + noinst_LIBRARIES = libsdlsopwith.a + diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild index 4ae1e34580e6..9aa903f05cb1 100644 --- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild +++ b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild,v 1.3 2010/10/15 13:50:25 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/sdl-sopwith-1.7.4.ebuild,v 1.4 2012/03/23 10:18:31 tupone Exp $ EAPI=2 -inherit eutils games +inherit eutils autotools games MY_P=${P/sdl-/} DESCRIPTION="Port of the classic Sopwith game using LibSDL" @@ -19,6 +19,12 @@ DEPEND=">=media-libs/libsdl-1.1.3[video]" S=${WORKDIR}/${MY_P} +src_prepare() { + rm acconfig.h + epatch "${FILESDIR}"/${P}-nogtk.patch + eautoreconf +} + src_install() { emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt |