diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-07-13 16:05:04 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-07-13 16:05:04 +0000 |
| commit | 9a807e3ed644985499785f97b4b0be8a88871af3 (patch) | |
| tree | ab473b8d19d8a7c4d2640c91f0c6986eaa958760 /games-strategy | |
| parent | Revbump because upstream changed contents of the distfiles (not saying what e... (diff) | |
| download | gentoo-2-9a807e3ed644985499785f97b4b0be8a88871af3.tar.gz gentoo-2-9a807e3ed644985499785f97b4b0be8a88871af3.tar.bz2 gentoo-2-9a807e3ed644985499785f97b4b0be8a88871af3.zip | |
add gcc47 patch from Peter Alfredsen (bug #424669)
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/warmux/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-gcc47.patch | 11 | ||||
| -rw-r--r-- | games-strategy/warmux/warmux-11.04.1.ebuild | 9 |
3 files changed, 21 insertions, 5 deletions
diff --git a/games-strategy/warmux/ChangeLog b/games-strategy/warmux/ChangeLog index 9733e3981b02..7268a309b7da 100644 --- a/games-strategy/warmux/ChangeLog +++ b/games-strategy/warmux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/warmux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.11 2012/05/04 04:51:08 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.12 2012/07/13 16:05:04 mr_bones_ Exp $ + + 13 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> + +files/warmux-11.04.1-gcc47.patch, warmux-11.04.1.ebuild: + add gcc47 patch from Peter Alfredsen (bug #424669) 04 May 2012; Jeff Horelick <jdhore@gentoo.org> warmux-11.01.ebuild, warmux-11.04.1.ebuild: diff --git a/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch new file mode 100644 index 000000000000..8460bcbd0b1c --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch @@ -0,0 +1,11 @@ +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> diff --git a/games-strategy/warmux/warmux-11.04.1.ebuild b/games-strategy/warmux/warmux-11.04.1.ebuild index 95f249b14457..08b29cf485c7 100644 --- a/games-strategy/warmux/warmux-11.04.1.ebuild +++ b/games-strategy/warmux/warmux-11.04.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.5 2012/05/04 04:51:08 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.6 2012/07/13 16:05:04 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -30,13 +30,14 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" -S="${WORKDIR}"/${PN}-11.04 +S=${WORKDIR}/${PN}-11.04 src_prepare() { epatch \ "${FILESDIR}"/${P}-gentoo.patch \ "${FILESDIR}"/${P}-zlib.patch \ - "${FILESDIR}"/${P}-action.patch + "${FILESDIR}"/${P}-action.patch \ + "${FILESDIR}"/${P}-gcc47.patch eautoreconf } @@ -52,7 +53,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog README TODO rm -f "${D}${GAMES_DATADIR}/${PN}/font/DejaVuSans.ttf" doicon data/icon/warmux.svg || die |