diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-05-02 19:15:45 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-05-02 19:15:45 +0000 |
| commit | 58214725f2302faa397a3fbab1d0c092ece80d71 (patch) | |
| tree | 581111a5ea90530422e0f0224355e1310b72396b /games-emulation | |
| parent | Use berlios mirror. bug #218657 (diff) | |
| download | gentoo-2-58214725f2302faa397a3fbab1d0c092ece80d71.tar.gz gentoo-2-58214725f2302faa397a3fbab1d0c092ece80d71.tar.bz2 gentoo-2-58214725f2302faa397a3fbab1d0c092ece80d71.zip | |
Fix building with gcc-4.3
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'games-emulation')
4 files changed, 56 insertions, 15 deletions
diff --git a/games-emulation/snes9express/ChangeLog b/games-emulation/snes9express/ChangeLog index 0474d58e6189..69918f4e1c78 100644 --- a/games-emulation/snes9express/ChangeLog +++ b/games-emulation/snes9express/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/snes9express # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/ChangeLog,v 1.10 2008/04/08 00:17:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/ChangeLog,v 1.11 2008/05/02 19:15:45 nyhm Exp $ + + 02 May 2008; Tristan Heaven <nyhm@gentoo.org> + -files/snes9express-1.42-fix.patch, +files/snes9express-1.42-gcc43.patch, + snes9express-1.42.ebuild: + Fix building with gcc-4.3 08 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org> snes9express-1.42.ebuild: diff --git a/games-emulation/snes9express/files/snes9express-1.42-fix.patch b/games-emulation/snes9express/files/snes9express-1.42-fix.patch deleted file mode 100644 index 16f6023444a8..000000000000 --- a/games-emulation/snes9express/files/snes9express-1.42-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- frend.cc 2004-03-01 04:22:01.000000000 +0100 -+++ frend.cc 2004-11-07 21:06:53.399647464 +0100 -@@ -21,6 +21,7 @@ - #include <cstdlib> - #include <climits> - #include <sstream> -+#include <errno.h> - - const char*fr_AppName; - GtkTooltips *fr_Tooltips; diff --git a/games-emulation/snes9express/files/snes9express-1.42-gcc43.patch b/games-emulation/snes9express/files/snes9express-1.42-gcc43.patch new file mode 100644 index 000000000000..d430ce87b9b0 --- /dev/null +++ b/games-emulation/snes9express/files/snes9express-1.42-gcc43.patch @@ -0,0 +1,45 @@ +--- frend.cc ++++ frend.cc +@@ -21,6 +21,8 @@ + #include <cstdlib> + #include <climits> + #include <sstream> ++#include <cerrno> ++#include <cstring> + + const char*fr_AppName; + GtkTooltips *fr_Tooltips; +--- misc.cc ++++ misc.cc +@@ -14,6 +14,7 @@ + #include <iostream> + #include <fstream> + #include <cstdio> ++#include <cstring> + #include <string> + #include <algorithm> + #include <unistd.h> +--- s9xskin.cc ++++ s9xskin.cc +@@ -24,6 +24,7 @@ + #include <unistd.h> + #include <string> + #include <list> ++#include <cstring> + #include "frend.h" + + const char *headstart = "snes9express skin\x09"; +--- skins.cc ++++ skins.cc +@@ -12,8 +12,9 @@ + * or go to http://www.gnu.org/copyleft/gpl.html + */ + +-#include <stdio.h> +-#include <stdlib.h> ++#include <cstdio> ++#include <cstdlib> ++#include <cstring> + #include <dirent.h> + #include <sys/types.h> + #include <sys/stat.h> diff --git a/games-emulation/snes9express/snes9express-1.42.ebuild b/games-emulation/snes9express/snes9express-1.42.ebuild index 2dcc33bc89b2..eaa715617b74 100644 --- a/games-emulation/snes9express/snes9express-1.42.ebuild +++ b/games-emulation/snes9express/snes9express-1.42.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-emulation/snes9express/snes9express-1.42.ebuild,v 1.10 2008/04/08 00:17:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9express/snes9express-1.42.ebuild,v 1.11 2008/05/02 19:15:45 nyhm Exp $ inherit eutils games @@ -22,12 +22,13 @@ DEPEND="${DEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-fix.patch \ - "${FILESDIR}/${P}"-gcc41.patch + epatch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-gcc43.patch } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README prepgamesdirs } |