diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-18 01:31:16 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-18 01:31:16 +0000 |
| commit | 138be152f29f1c6ec37684ff47dbc24808e33029 (patch) | |
| tree | 02456ec50c92a7b11a4d6f0adb1dc2cdfdf2b174 /games-arcade | |
| parent | stable amd64, bug 274403 (diff) | |
| download | historical-138be152f29f1c6ec37684ff47dbc24808e33029.tar.gz historical-138be152f29f1c6ec37684ff47dbc24808e33029.tar.bz2 historical-138be152f29f1c6ec37684ff47dbc24808e33029.zip | |
Fix building with gcc-4.4, bug #273520
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/cob/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/cob/Manifest | 13 | ||||
| -rw-r--r-- | games-arcade/cob/cob-0.9.ebuild | 19 | ||||
| -rw-r--r-- | games-arcade/cob/files/cob-0.9-gcc44.patch | 30 |
4 files changed, 50 insertions, 20 deletions
diff --git a/games-arcade/cob/ChangeLog b/games-arcade/cob/ChangeLog index eac8a4aa3514..27e6476bb2b4 100644 --- a/games-arcade/cob/ChangeLog +++ b/games-arcade/cob/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/cob -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/cob/ChangeLog,v 1.9 2008/04/30 21:48:15 nyhm Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/cob/ChangeLog,v 1.10 2009/06/18 01:31:16 nyhm Exp $ + + 18 Jun 2009; Tristan Heaven <nyhm@gentoo.org> cob-0.9.ebuild, + +files/cob-0.9-gcc44.patch: + Fix building with gcc-4.4, bug #273520 30 Apr 2008; Tristan Heaven <nyhm@gentoo.org> +files/cob-0.9-gcc43.patch, cob-0.9.ebuild: diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest index aa813e127d26..c405b52dd516 100644 --- a/games-arcade/cob/Manifest +++ b/games-arcade/cob/Manifest @@ -2,14 +2,15 @@ Hash: SHA1 AUX cob-0.9-gcc43.patch 610 RMD160 d8d9949be4adf23cfed5246692444108f872e592 SHA1 b0e69db63812edd3e58e46abef55f9acc8a644c7 SHA256 f72cbcfcb2d586cc56ab8122118db7570f5bdf0a50e72db046b8ec713e1b964f +AUX cob-0.9-gcc44.patch 1135 RMD160 f107d675937598f7c035719726890a685e9404e5 SHA1 4784e157c62987def38a7c86ad7aff75946b4e0b SHA256 64c983c28c6f47a3fe23a04159f1c89f7b34a4d18c4262a7036356f8f85b272d DIST cob-0.9.tar.gz 712618 RMD160 512e972eaa17eddb498f11b82aa97b7d138e670c SHA1 0c4fa8c9b17b31c82705ecfe9a131b5cd827bd19 SHA256 e065bc5a3dabb7c4709cbfc4c44e683c815b95c2a0c4d80d26feb3e4833cf60e -EBUILD cob-0.9.ebuild 808 RMD160 06cdb1ceaf0c78618bec8b130df3f1dc87c124e6 SHA1 f763d68c00abffbbb495d54b41e5514ee47ef1d4 SHA256 5c6c4d118773548906d16c7c9b66c12c5760a9c5ea3308a16263d6889ff6fd1a -MISC ChangeLog 1041 RMD160 b2df006204dee98581172f5ad2af15f1ea35649c SHA1 d18244175e228a13454c7eb2aee0ca5bcc6640fe SHA256 90af92156deef4efac65b083fb335a09287bf75156f87c988b53515475c8336a +EBUILD cob-0.9.ebuild 709 RMD160 84dc9cd21068c38b6cb11b5e4957d16a3a09ef4c SHA1 427e8e5f3dc0086c58847c75126078373e13183d SHA256 8a8820e6cd8b81b599f4adfc3b6df5f011d894d452665f1f7468defc25e37c50 +MISC ChangeLog 1178 RMD160 74257ccedfd15eb4996f540e29eac2c2f583ccc2 SHA1 ab2e10fdd44182bf24456fc21005fbe50ea87d4c SHA256 eff118888d79c7f48e91dc33e2d013194468a972383561d369feab9f4e18afc5 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkgY6SQACgkQdz7hIScOURHeMgCdFgWmapkVDSMqVznP99WhBY+h -DtAAn38DsIrOrZzBte0xyLVazb3Q3s2f -=QDuq +iEYEARECAAYFAko5mOoACgkQdz7hIScOURFxjwCeMyGHcfWvKpNXUE/20mzIqyY3 +8EUAn2QW6oCrEc1FeDjgNFOq6NyHHuTs +=E8SI -----END PGP SIGNATURE----- diff --git a/games-arcade/cob/cob-0.9.ebuild b/games-arcade/cob/cob-0.9.ebuild index 4403fa846381..7a755eea8b53 100644 --- a/games-arcade/cob/cob-0.9.ebuild +++ b/games-arcade/cob/cob-0.9.ebuild @@ -1,7 +1,8 @@ -# 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/cob/cob-0.9.ebuild,v 1.12 2008/04/30 21:48:15 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/cob/cob-0.9.ebuild,v 1.13 2009/06/18 01:31:16 nyhm Exp $ +EAPI=2 inherit eutils games DESCRIPTION="Cruising on Broadway: a painting-type game" @@ -15,16 +16,10 @@ IUSE="" DEPEND="media-libs/libsdl" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc43.patch - # gcc34 compile fix (bug #119061) - sed -i \ - -e '195 s/;//' \ - cob/sdw.hxx \ - || die "sed failed" -} +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc44.patch +) src_install() { emake DESTDIR="${D}" install || die "emake install failed" diff --git a/games-arcade/cob/files/cob-0.9-gcc44.patch b/games-arcade/cob/files/cob-0.9-gcc44.patch new file mode 100644 index 000000000000..dd90b388e6d8 --- /dev/null +++ b/games-arcade/cob/files/cob-0.9-gcc44.patch @@ -0,0 +1,30 @@ +--- cob/game.cpp ++++ cob/game.cpp +@@ -15,6 +15,7 @@ + * * + ***************************************************************************/ + ++#include <cstdio> + #include "cob.hxx" + + // ************************************************************************************************************************** +--- cob/main.cpp ++++ cob/main.cpp +@@ -15,6 +15,7 @@ + * * + ***************************************************************************/ + ++#include <cstdio> + #include "cob.hxx" + + // ************************************************************************************************************************** +--- cob/map.cpp ++++ cob/map.cpp +@@ -15,6 +15,7 @@ + * * + ***************************************************************************/ + ++#include <cstdio> + #include "cob.hxx" + + // ************************************************************************************************************************** |