summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-05-02 18:42:50 +0000
committerTristan Heaven <tristan@gentoo.org>2008-05-02 18:42:50 +0000
commitd9cfcf895e35ee0efae533e3751ac31b92a1986d (patch)
treeae93b02c9e4a4fc39dbb66ff01edcfcc82578b93 /games-emulation
parentUse berlios mirror. bug #218657 (diff)
downloadhistorical-d9cfcf895e35ee0efae533e3751ac31b92a1986d.tar.gz
historical-d9cfcf895e35ee0efae533e3751ac31b92a1986d.tar.bz2
historical-d9cfcf895e35ee0efae533e3751ac31b92a1986d.zip
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/stella/ChangeLog6
-rw-r--r--games-emulation/stella/Manifest15
-rw-r--r--games-emulation/stella/files/stella-2.5.1-gcc43.patch20
-rw-r--r--games-emulation/stella/stella-2.5.1.ebuild5
4 files changed, 41 insertions, 5 deletions
diff --git a/games-emulation/stella/ChangeLog b/games-emulation/stella/ChangeLog
index bcf2498c188c..233a1ac8d657 100644
--- a/games-emulation/stella/ChangeLog
+++ b/games-emulation/stella/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/stella
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.27 2008/04/18 18:39:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.28 2008/05/02 18:42:50 nyhm Exp $
+
+ 02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+ +files/stella-2.5.1-gcc43.patch, stella-2.5.1.ebuild:
+ Fix building with gcc-4.3
*stella-2.5.1 (18 Apr 2008)
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index c79b238e0e67..0e90a9507c18 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX stella-2.5.1-gcc43.patch 417 RMD160 eab12d78ab46760b47b43e330c4a93ed04d471c0 SHA1 6c40fb8b013ebfe948d08155b1ae0aff6f36f43c SHA256 17c3a20bbdd545f9747fcce4e7aaa1e96f15906b1336707746f57914f6adf23f
DIST stella-2.2-src.tar.gz 1569101 RMD160 0353028d93ff43b009beb08381168d1a6763cc8f SHA1 2c8e2e0c9e7820e3d0b6cc19887b6cf6c4e40a1d SHA256 3ed5ca029a725a9146eb9f737c6167d241ab6541aa55ecd6bd759a8d0628155a
DIST stella-2.4.2-src.tar.gz 1203083 RMD160 dbfb634b6ca4c5573914248b47d50cc52f9a619b SHA1 6cd80e740042a99f6370f01d3f8ba0b3eb4edf44 SHA256 52a2c07575c0d569a587d734e7853f40901560c277bfa5cca19942dfaf5782d2
DIST stella-2.5.1-src.tar.gz 1324036 RMD160 1e92c71c76d15122485b7ad030d52b4161ae391b SHA1 d207241801f3eaad71336f44e2ee5a0392fa27ba SHA256 c586f47f9d9866e84cd6eac4916cf8f3f3791d7db7de2bbac875a153589f8239
EBUILD stella-2.2.ebuild 1082 RMD160 cfe60a20e062880c80f6fbdd337506641a46c363 SHA1 874d6b97c5bdb723d228fbe592c75d308c12ff5c SHA256 b128444231db1c4af48e783c47cb0e8caa07f6a44b4ea2529985420a299deb40
EBUILD stella-2.4.2.ebuild 1086 RMD160 160968b721a8e0d757bc7bdd6d136ceeaf3e1b6d SHA1 577b96c09b2cf3dedb72f0cbe3c82fca0085f47d SHA256 05d8734b4e2f3a284287bee71cbd81108f382d68def6f191c1bc2735e0a66837
-EBUILD stella-2.5.1.ebuild 1090 RMD160 139380c3eb5e9c812336ff11be71d708f8d25a8e SHA1 e94ebdb20c0d4f03bd46466689ff01c6c4e79441 SHA256 d4c0950a6255f7efbb5fe78f6e4e295d0334434ab76870971ab29bf1af33dfa2
-MISC ChangeLog 3522 RMD160 e03fcbdcf13c8aa95f6524dd3729b9c8285b7fc4 SHA1 7eea13a9b79924d528d004e19bbf2a40cff6d18d SHA256 023659b9801a2f60896c4de2013eee8df70f6af89a496eda72748747a9801e1e
+EBUILD stella-2.5.1.ebuild 1117 RMD160 ba984dfb8dbd2f58eb797a02b78b30d1170ea198 SHA1 695b887195920fb61a18c0b31de1f7033d145df2 SHA256 07d3abb12711999f84e331de688377271589458ac15c12d652131bba5ec64211
+MISC ChangeLog 3650 RMD160 d8a1be0db28c50f611fc7cec333d9db58a818d8d SHA1 0c3a8460c1c1b42a318ea1b237d80009340fc957 SHA256 cbaabced88ed1dde8b9d219f3055835cdd62c791b711d1fc07f636bdc9b3b6fc
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgbYLAACgkQdz7hIScOURFOmwCg2LfKdxn6L1gsZw6A89iQjaRq
+4VUAn2LiEg8NVqMGE36olUKkdjwDNNAI
+=QUCd
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/stella/files/stella-2.5.1-gcc43.patch b/games-emulation/stella/files/stella-2.5.1-gcc43.patch
new file mode 100644
index 000000000000..175c8112d9ac
--- /dev/null
+++ b/games-emulation/stella/files/stella-2.5.1-gcc43.patch
@@ -0,0 +1,20 @@
+--- src/emucore/CartAR.cxx
++++ src/emucore/CartAR.cxx
+@@ -17,6 +17,7 @@
+ //============================================================================
+
+ #include <cassert>
++#include <cstring>
+
+ #include "M6502Hi.hxx"
+ #include "Random.hxx"
+--- src/emucore/Cart.cxx
++++ src/emucore/Cart.cxx
+@@ -18,6 +18,7 @@
+
+ #include <cassert>
+ #include <sstream>
++#include <cstring>
+
+ #include "bspf.hxx"
+ #include "Cart.hxx"
diff --git a/games-emulation/stella/stella-2.5.1.ebuild b/games-emulation/stella/stella-2.5.1.ebuild
index 6a2c66ea6c0b..c230c4d1db66 100644
--- a/games-emulation/stella/stella-2.5.1.ebuild
+++ b/games-emulation/stella/stella-2.5.1.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/stella/stella-2.5.1.ebuild,v 1.1 2008/04/18 18:39:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-2.5.1.ebuild,v 1.2 2008/05/02 18:42:50 nyhm Exp $
inherit eutils games
@@ -20,6 +20,7 @@ DEPEND="media-libs/libsdl
src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e '/INSTALL/s/-s //' \
-e '/strip/d' \
@@ -43,6 +44,6 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
doicon src/common/stella.xpm
- make_desktop_entry stella Stella stella
+ make_desktop_entry stella Stella
prepgamesdirs
}