diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2006-05-28 10:51:30 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-28 10:51:30 +0000 |
commit | bf8f5cdd0358cafac0b647ba2cdc979034dac221 (patch) | |
tree | 196fad4f8b87b6adbd723c1e9d5a3bfaa5d20a6f /games-strategy | |
parent | Stable on alpha. (diff) | |
download | gentoo-2-bf8f5cdd0358cafac0b647ba2cdc979034dac221.tar.gz gentoo-2-bf8f5cdd0358cafac0b647ba2cdc979034dac221.tar.bz2 gentoo-2-bf8f5cdd0358cafac0b647ba2cdc979034dac221.zip |
Fix for gcc-4.1
(Portage version: 2.1_rc2-r3)
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/ufo2000/ChangeLog | 8 | ||||
-rw-r--r-- | games-strategy/ufo2000/files/digest-ufo2000-0.6.627 | 12 | ||||
-rw-r--r-- | games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch | 29 | ||||
-rw-r--r-- | games-strategy/ufo2000/ufo2000-0.6.627.ebuild | 6 |
4 files changed, 49 insertions, 6 deletions
diff --git a/games-strategy/ufo2000/ChangeLog b/games-strategy/ufo2000/ChangeLog index 1f61b41dda83..520b5f40fbb3 100644 --- a/games-strategy/ufo2000/ChangeLog +++ b/games-strategy/ufo2000/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/ufo2000 -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.12 2005/09/06 13:01:15 wolf31o2 Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.13 2006/05/28 10:51:30 tupone Exp $ + + 28 May 2006; <Tupone@gentoo.org> +files/ufo2000-0.6.627-gcc41.patch, + ufo2000-0.6.627.ebuild: + Fix for gcc-4.1 06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> ufo2000-0.6.627.ebuild: diff --git a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 b/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 index 93bb53a2c88e..59ebe3ed229a 100644 --- a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 +++ b/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 @@ -1,4 +1,12 @@ -MD5 ee14e98c8e751cfaa734aeeb52fef4cf ufo2000-0.6.627-src.tar.bz2 795646 -MD5 0cabff3ae8ad047fde1753e9075358b4 xcomdemo.zip 1148768 MD5 0267a027ec437bf1b93e0cb1394a2c46 terror.zip 1096279 +RMD160 eeed8764d8cc26ddf4c57179f17d7eabaf85ec72 terror.zip 1096279 +SHA256 9af0930f6aade6cc02355c3d0354e9ccca4989f22636a013b3c34b2e55336cc8 terror.zip 1096279 +MD5 ee14e98c8e751cfaa734aeeb52fef4cf ufo2000-0.6.627-src.tar.bz2 795646 +RMD160 fbe561bcfeb85f63869f030d46bc40ebb274ae6f ufo2000-0.6.627-src.tar.bz2 795646 +SHA256 c34ae7525d222e506f77ec8de4ea34704a5b4a1f785433e245ec6b5683f00eaa ufo2000-0.6.627-src.tar.bz2 795646 MD5 92df4c6e94ec7b2f0d720aecb1e4e68e ufo2000-music-20041222.zip 1661196 +RMD160 4baa339c746da218e794743b608bc0fe15387442 ufo2000-music-20041222.zip 1661196 +SHA256 45fe31944de38c160e145cf2b2eedf42f9d0cef66edfdb3d06132617e15104c6 ufo2000-music-20041222.zip 1661196 +MD5 0cabff3ae8ad047fde1753e9075358b4 xcomdemo.zip 1148768 +RMD160 b160b2ad4314e787b471b38ea58abcf7846c4a0b xcomdemo.zip 1148768 +SHA256 11c0166cbb9e58a1f7bab0891626368c7ba86e2c1cbb8f596391602c9e9b893c xcomdemo.zip 1148768 diff --git a/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch b/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch new file mode 100644 index 000000000000..8b8c249e6196 --- /dev/null +++ b/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch @@ -0,0 +1,29 @@ +--- src/global.h.old 2006-05-28 12:30:33.000000000 +0200 ++++ src/global.h 2006-05-28 12:31:10.000000000 +0200 +@@ -412,6 +412,7 @@ + extern DATAFILE *datafile; + extern int NOTICEremote; + extern Wind *info_win; ++class Icon; + extern Icon *icon; + extern int g_time_limit; + extern int g_p2_start_sit; +--- src/server.h.old 2006-05-28 12:31:30.000000000 +0200 ++++ src/server.h 2006-05-28 12:32:09.000000000 +0200 +@@ -40,7 +40,7 @@ + NLsocket m_socket; + public: + virtual ~ClientServer(); +- bool ClientServer::connect( ++ bool connect( + const std::string &host, + const std::string &proxy, + std::string &error_message); +@@ -54,6 +54,7 @@ + /** + * Server side client-server connection + */ ++class ServerDispatch; + class ServerClient + { + protected: diff --git a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild index 71023a8722b3..7ac0c38da112 100644 --- a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild +++ b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.5 2005/09/06 13:01:15 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.6 2006/05/28 10:51:30 tupone Exp $ inherit games @@ -44,6 +44,8 @@ src_unpack() { cd "${S}/newmusic" unpack ufo2000-music-20041222.zip fi + cd "${S}" + epatch "${FILESDIR}/${P}"-gcc41.patch } src_compile() { |