diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2008-05-01 10:40:51 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2008-05-01 10:40:51 +0000 |
| commit | e20ebe665eded2dda5f66a4379912554bbece967 (patch) | |
| tree | 570062898f6b74b4ca135657e0350e1fbe886bf1 /games-puzzle | |
| parent | Fix building with gcc-4.3 (diff) | |
| download | historical-e20ebe665eded2dda5f66a4379912554bbece967.tar.gz historical-e20ebe665eded2dda5f66a4379912554bbece967.tar.bz2 historical-e20ebe665eded2dda5f66a4379912554bbece967.zip | |
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/shaaft/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/shaaft/Manifest | 15 | ||||
| -rw-r--r-- | games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch | 23 | ||||
| -rw-r--r-- | games-puzzle/shaaft/shaaft-0.5.0.ebuild | 14 |
4 files changed, 50 insertions, 10 deletions
diff --git a/games-puzzle/shaaft/ChangeLog b/games-puzzle/shaaft/ChangeLog index 7969227b6271..010855898bb9 100644 --- a/games-puzzle/shaaft/ChangeLog +++ b/games-puzzle/shaaft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/shaaft -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.8 2007/02/22 01:16:31 peper Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.9 2008/05/01 10:40:51 nyhm Exp $ + + 01 May 2008; Tristan Heaven <nyhm@gentoo.org> + +files/shaaft-0.5.0-gcc43.patch, shaaft-0.5.0.ebuild: + Fix building with gcc-4.3 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest index ba0c331f012e..a714818e20f2 100644 --- a/games-puzzle/shaaft/Manifest +++ b/games-puzzle/shaaft/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX shaaft-0.5.0-gcc34.patch 544 RMD160 d54ef48c0557ce2dc0774f2897b7796989e97b53 SHA1 ec7ee84e40543bb7f65cc22b6cebdcf93bf91e2a SHA256 0eecaba26e1d7e8d43a4a7c556e9624e910d8e1c292228755cf4f4670cb3a052 AUX shaaft-0.5.0-gcc41.patch 277 RMD160 666f376a8313f0df536f326f94552e3c6a15d307 SHA1 ac240b39a9f718cfe0038404782eea7fec62c373 SHA256 15c5a0b6a48e44c2b42dbb7a37ea348f12fc4ebcb4b9866594f39283ccbf9dd1 +AUX shaaft-0.5.0-gcc43.patch 428 RMD160 1445bde8b9c4c2e3592bea9688b4cb923c960d66 SHA1 559bf65d1a5b5a1d3af16c2b2f84b2e9443807b1 SHA256 923bbf44762997fa9cef7b42c93bac31da05ae622eb8f3f12abad4f11d7a7549 DIST Shaaft-0.5.0.tar.bz2 512996 RMD160 88441778220be57923aa6ca50de0d08a365ee9fc SHA1 d9e5d70e13e406ec98dee551ec77544010c786ab SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 -EBUILD shaaft-0.5.0.ebuild 972 RMD160 6fe7e01123f7f00d57c68e6071abaf3db1dfb870 SHA1 48473e6963f2e44d19e90aee75fbdb74882d0f0e SHA256 5bb528cbf0b33dc8403e204760d1863d2075d400286d5bbbfabb56b1316feb2c -MISC ChangeLog 1060 RMD160 6de6cc071020abda78cfb4f17ae40d10e7775a14 SHA1 2d8cea02d58040c782feb93fdabcf33c6a85a039 SHA256 d9cab225b39d25078c0e97d3cd4a551168fc8df131a1d21e8633bfa08c5044b6 +EBUILD shaaft-0.5.0.ebuild 1006 RMD160 2ccb62c407730cd63a567f0e7701fcb499c50dcd SHA1 b3ecc54b93282049cf8d5771e5ee57301f3565ca SHA256 05c10e2b865cd1eb5de90c7c0e381c52530a39dac0227a0dc9776bb2a7eca24b +MISC ChangeLog 1192 RMD160 7da6a18eb0aa97aba90984582d6487045f50a539 SHA1 9d1c9f5d95a385525523ca582fa3e26cbc595699 SHA256 10b918dacbfb16b911d48451309b94f7d825798b04f9bea79db75253ba3fc5df MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgZnjgACgkQdz7hIScOURHYygCgn0/VuSmMgxq1sT2nEisdTv+t +ZuoAnihZmfK63IZBEy9ZgHPriiSyX7wL +=gex6 +-----END PGP SIGNATURE----- diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch new file mode 100644 index 000000000000..2ddb37c75514 --- /dev/null +++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch @@ -0,0 +1,23 @@ +--- utils/ResourceManager.cpp ++++ utils/ResourceManager.cpp +@@ -17,6 +17,7 @@ + #include <dirent.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <cstring> + + #include <Trace.hpp> + #include <ResourceManager.hpp> +--- utils/Value.hpp ++++ utils/Value.hpp +@@ -15,8 +15,9 @@ + #ifndef _Value_hpp_ + #define _Value_hpp_ + +-#include <stdio.h> ++#include <cstdio> + #include <string> ++#include <cstdlib> + + #include <Trace.hpp> + diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild index 77ed456e86d6..24f0b9183e95 100644 --- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild +++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.10 2007/02/03 14:03:16 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.11 2008/05/01 10:40:51 nyhm Exp $ inherit eutils games @@ -16,7 +16,7 @@ IUSE="" DEPEND="virtual/opengl sys-libs/zlib media-libs/libpng - >=media-libs/libsdl-1.2 + media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image" @@ -31,12 +31,14 @@ src_unpack() { game/main.cpp \ || die "sed main.cpp failed" - epatch "${FILESDIR}"/${P}-gcc34.patch \ - "${FILESDIR}/${P}"-gcc41.patch + epatch \ + "${FILESDIR}"/${P}-gcc34.patch \ + "${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 TODO.txt prepgamesdirs } |