diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-01-27 14:42:16 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-01-27 14:42:16 +0000 |
| commit | 50c408a21f6da5562966196d1e755918e0b97239 (patch) | |
| tree | 81717ac118ff77e455fb5ee4a9811339318e7d72 /games-arcade | |
| parent | version bump (diff) | |
| download | historical-50c408a21f6da5562966196d1e755918e0b97239.tar.gz historical-50c408a21f6da5562966196d1e755918e0b97239.tar.bz2 historical-50c408a21f6da5562966196d1e755918e0b97239.zip | |
Fix gcc-4.3 bug #253496
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/wop/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/wop/Manifest | 5 | ||||
| -rw-r--r-- | games-arcade/wop/files/wop-0.4.3-gcc43.patch | 31 | ||||
| -rw-r--r-- | games-arcade/wop/wop-0.4.3-r1.ebuild | 7 |
4 files changed, 44 insertions, 7 deletions
diff --git a/games-arcade/wop/ChangeLog b/games-arcade/wop/ChangeLog index 2eca10b983d0..8e9d50d48a19 100644 --- a/games-arcade/wop/ChangeLog +++ b/games-arcade/wop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/wop -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/ChangeLog,v 1.8 2008/06/22 15:32:17 maekke Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/ChangeLog,v 1.9 2009/01/27 14:42:16 tupone Exp $ + + 27 Jan 2009; Alfredo Tupone <tupone@gentoo.org> + +files/wop-0.4.3-gcc43.patch, wop-0.4.3-r1.ebuild: + Fix gcc-4.3 bug #253496 by Erik Hahn <erik_hahn@gmx.de> 22 Jun 2008; Markus Meier <maekke@gentoo.org> wop-0.4.3-r1.ebuild: x86 stable, bug #227645 diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest index c3241d30e2e2..c4f4d3dc53c1 100644 --- a/games-arcade/wop/Manifest +++ b/games-arcade/wop/Manifest @@ -1,6 +1,7 @@ AUX wop-0.4.3-Makefile.patch 1476 RMD160 dda50bcf7c8b67a8d7baba8a48435d6d94166bcf SHA1 ce428667aa10559045c3875c27a0ca028cb85d5e SHA256 298c2d1b4ad5c93f61ddad162d50482fd5f6214401121fc6252c4915eb61c370 +AUX wop-0.4.3-gcc43.patch 858 RMD160 a32d0f7fc5e7596fd330b4a956ca8c8108ee1ba2 SHA1 1f50b6de82f628d58737c677427b68e2da4c792f SHA256 d9320f428a3dedba40b23b64d1fbe50ae9d1e5d32d40efcff837940dc730879b DIST wop-0.4.3-src.tar.bz2 280974 RMD160 9e7dc590557a7fbf9f00691d70c520155ca9a6a7 SHA1 b5556d83e6855e50fe439b57978c4c5c0521d4a8 SHA256 7e7213e5e5f5af9154c255132ca772c8e6d7815a1a1915fc5faa443c8f40ff23 DIST wopdata-2005-12-21.tar.bz2 4217006 RMD160 3ea35cca0b28bbd0ff278899b5cc1d8dd83e0602 SHA1 8a1b3c7dfcc1c938aa18afb938caa2ce6e4c1b28 SHA256 cd6b8eb9f77f709d7a52b913d8a665bd202c53ceca9cf96b4c9f9adc17d8a6b2 -EBUILD wop-0.4.3-r1.ebuild 1646 RMD160 f5a52e1812181c1e5a38de57c607e3d1ccd2344b SHA1 9ae26ead770b0c8112c59a2572fd99bb4cae69c4 SHA256 59e897ab7d6adba74703a2439390a79735af297a5756b882cb8d684b1c8f596d -MISC ChangeLog 1309 RMD160 cec58251cb0335604e24472a112989d831afa551 SHA1 03842f82247c18db0cb0e60ac08d667eb8ae600b SHA256 1167dd0d4282de77118f22be8656ffcf990543532626bbfe51f59ac729025540 +EBUILD wop-0.4.3-r1.ebuild 1681 RMD160 acf6c72fd9271644138f2db71d63df02a82448ae SHA1 cab4eda11a1796a53d4a46a99131ebea857150ed SHA256 e7d85bcbce099890d32051764cb94a606275500d2db277b0c4c1cb20ce898ccc +MISC ChangeLog 1471 RMD160 d5750461f2f13769c970cf9928c9429f836a8046 SHA1 79bfb15e179c1ef5b46db013c25620061cd2b5c9 SHA256 c516a2f8b23afe79b2e99ad19a30e780f74e75966423998f4499a0c89916f308 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch new file mode 100644 index 000000000000..59aee2a665dd --- /dev/null +++ b/games-arcade/wop/files/wop-0.4.3-gcc43.patch @@ -0,0 +1,31 @@ +--- src/scusibot.cpp.old 2009-01-27 15:22:39.000000000 +0100 ++++ src/scusibot.cpp 2009-01-27 15:23:10.000000000 +0100 +@@ -5,6 +5,7 @@ + #include "stationarygun.hpp" + #include "global.hpp" + #include <vector> ++#include <algorithm> + + ScusiBot::ScusiBot() + : m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) { +--- src/spriteset.cpp.old 2009-01-27 15:26:39.000000000 +0100 ++++ src/spriteset.cpp 2009-01-27 15:27:51.000000000 +0100 +@@ -2,6 +2,7 @@ + + #include "spriteset.hpp" + #include "global.hpp" ++#include "sprite.hpp" + + /**********************************************************/ + +@@ -17,6 +18,9 @@ + #endif // SUPPRESS_COLORING + #endif // BLACK_ + ++/* force creation of an implementation of SpriteSet<Sprite> */ ++static SpriteSet<Sprite> foo; ++ + /**********************************************************/ + + template <class T> + diff --git a/games-arcade/wop/wop-0.4.3-r1.ebuild b/games-arcade/wop/wop-0.4.3-r1.ebuild index a8d6ba7c8686..fe3a6a4301d3 100644 --- a/games-arcade/wop/wop-0.4.3-r1.ebuild +++ b/games-arcade/wop/wop-0.4.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/wop-0.4.3-r1.ebuild,v 1.5 2008/06/22 15:32:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/wop-0.4.3-r1.ebuild,v 1.6 2009/01/27 14:42:16 tupone Exp $ inherit eutils toolchain-funcs games @@ -39,7 +39,8 @@ src_unpack() { -e "s:^data =.*$:data = ${GAMES_DATADIR}/${PN}:" \ woprc \ || die "sed failed" - epatch "${FILESDIR}"/${P}-Makefile.patch + epatch "${FILESDIR}"/${P}-Makefile.patch \ + "${FILESDIR}"/${P}-gcc43.patch } src_compile() { |