diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-05-19 20:19:58 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-19 20:19:58 +0000 |
| commit | 1106b06454478623a3136013807a2f6109bd9424 (patch) | |
| tree | 5eaa623fea804ce5acae67bf17a735eab2572033 /games-puzzle | |
| parent | Make sure that the correct includedir and the correct library name is used. S... (diff) | |
| download | historical-1106b06454478623a3136013807a2f6109bd9424.tar.gz historical-1106b06454478623a3136013807a2f6109bd9424.tar.bz2 historical-1106b06454478623a3136013807a2f6109bd9424.zip | |
Fix for gcc-4.1
Package-Manager: portage-2.1_rc1-r2
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/magiccube4d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/magiccube4d/Manifest | 37 | ||||
| -rw-r--r-- | games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch | 22 | ||||
| -rw-r--r-- | games-puzzle/magiccube4d/magiccube4d-2.2.ebuild | 7 |
4 files changed, 60 insertions, 12 deletions
diff --git a/games-puzzle/magiccube4d/ChangeLog b/games-puzzle/magiccube4d/ChangeLog index f5017db05dbf..e95f57e2bb19 100644 --- a/games-puzzle/magiccube4d/ChangeLog +++ b/games-puzzle/magiccube4d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/magiccube4d # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.6 2006/02/17 22:16:08 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.7 2006/05/19 20:19:58 tupone Exp $ + + 19 May 2006; <Tupone@gentoo.org> +files/magiccube4d-2.2-gcc41.patch, + magiccube4d-2.2.ebuild: + Fix emerge with gcc-4.1 17 Feb 2006; <Tupone@gentoo.org> magiccube4d-2.2.ebuild: Modular X dependency fix diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest index 6394535f60e4..0e6e8a0b72a0 100644 --- a/games-puzzle/magiccube4d/Manifest +++ b/games-puzzle/magiccube4d/Manifest @@ -1,15 +1,34 @@ -MD5 52b9284d3a7297a71668f42410a5f81b ChangeLog 682 -RMD160 327db0389be021572c0c6d799ac2080c2208f22a ChangeLog 682 -SHA256 bcca81d77e016b8ad04c6d5b3768d5a0daa80fd1afeee7ed4ea800ef032f3db2 ChangeLog 682 -MD5 3d5a7c62e39e67ad6d22106ed0c86f23 files/digest-magiccube4d-2.2 229 -RMD160 57a0f2b58a7ce7c7e392fbb2d677d2b7c34a6a85 files/digest-magiccube4d-2.2 229 -SHA256 ea458210c624c8df8260f3d545bf2506496f591c7ef63eaaefc16821726b512e files/digest-magiccube4d-2.2 229 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX magiccube4d-2.2-gcc41.patch 877 RMD160 d7465f4766d60c1ba848a3bbaaf43eff992278fc SHA1 653bafd8ec124b1ffed87f1ec8def5156755aec5 SHA256 b69cc3f95795e5c7c6885bf69ffa384695fe001270e6bb3837ec39568e0c9d1a size 877 +MD5 8b10e471e230f7c055bfa08cf7ec3615 files/magiccube4d-2.2-gcc41.patch 877 +RMD160 d7465f4766d60c1ba848a3bbaaf43eff992278fc files/magiccube4d-2.2-gcc41.patch 877 +SHA256 b69cc3f95795e5c7c6885bf69ffa384695fe001270e6bb3837ec39568e0c9d1a files/magiccube4d-2.2-gcc41.patch 877 +AUX magiccube4d-EventHandler.patch 425 RMD160 7def7090510bb0ff21bddfc1c392ba9629bd933d SHA1 638e816767be628ce78de04609f26228fac60f53 SHA256 6bfdc4a34d560624da46f437f66f857c259dc8cf945feb0d989f4fc3a145a98b size 425 MD5 90c881c0f91424913c40d79bc940e47d files/magiccube4d-EventHandler.patch 425 RMD160 7def7090510bb0ff21bddfc1c392ba9629bd933d files/magiccube4d-EventHandler.patch 425 SHA256 6bfdc4a34d560624da46f437f66f857c259dc8cf945feb0d989f4fc3a145a98b files/magiccube4d-EventHandler.patch 425 -MD5 97fc530b1b7966b614dae0b07271c157 magiccube4d-2.2.ebuild 893 -RMD160 658e45068e491dea5a50c8127ea60d0644ff3cb9 magiccube4d-2.2.ebuild 893 -SHA256 04e91d85004ca5186cb71221ad231fe48b084f1d7a27a64c2e04a6778da74b0f magiccube4d-2.2.ebuild 893 +DIST mc4d-src-2_2.tgz 144645 RMD160 c7bfabceb64c0c0515e94f01bcd528bd550f9b3e SHA256 79c7b62bbe7a132a2eacf58f92f80113ea63171d3eea59755bc828a1aa9daa44 size 144645 +EBUILD magiccube4d-2.2.ebuild 967 RMD160 96d3d1c4095ff30d46f8990a7ca0a1df8552f6a5 SHA1 de6b5405cb5aadc4dfe2267ad22cf755b252883d SHA256 ea0137d0540688b138a462c07e67f5a5980b1f963e313406cd3085cca115b592 size 967 +MD5 ac8b59185b0e08b5faa0809dff7cad8e magiccube4d-2.2.ebuild 967 +RMD160 96d3d1c4095ff30d46f8990a7ca0a1df8552f6a5 magiccube4d-2.2.ebuild 967 +SHA256 ea0137d0540688b138a462c07e67f5a5980b1f963e313406cd3085cca115b592 magiccube4d-2.2.ebuild 967 +MISC ChangeLog 806 RMD160 365b93386ace8150a1eeb2e84a70d2a163d5b614 SHA1 6391d6d4a39bf411d0976f27fb2cf1ea47bb427d SHA256 14f7014bd5074c963b53cbd5a175c32290650920a89ec08344cfd84ca931b585 size 806 +MD5 d4b89e5fb22a95391626af3bdc93cdf9 ChangeLog 806 +RMD160 365b93386ace8150a1eeb2e84a70d2a163d5b614 ChangeLog 806 +SHA256 14f7014bd5074c963b53cbd5a175c32290650920a89ec08344cfd84ca931b585 ChangeLog 806 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +MD5 3d5a7c62e39e67ad6d22106ed0c86f23 files/digest-magiccube4d-2.2 229 +RMD160 57a0f2b58a7ce7c7e392fbb2d677d2b7c34a6a85 files/digest-magiccube4d-2.2 229 +SHA256 ea458210c624c8df8260f3d545bf2506496f591c7ef63eaaefc16821726b512e files/digest-magiccube4d-2.2 229 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEbiiI2CTtIKiFlQIRArIuAJ4gMRpDfEIGkEeffRbvzlm1rPm7uwCeOmBa +hng0Xkpml8l3WzNIoh3X7T4= +=GL0G +-----END PGP SIGNATURE----- diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch new file mode 100644 index 000000000000..adb4d2836a62 --- /dev/null +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch @@ -0,0 +1,22 @@ +--- EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200 ++++ EventHandler.h 2006-05-19 22:11:58.000000000 +0200 +@@ -165,7 +165,7 @@ + + int number_of_reference_stickers_needed; + int (*reference_stickers_needed)[4]; +- void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL); ++ void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg); + void* cur_ui_data; + + bool quick_mode; +--- Machine.h.old 2006-05-19 22:12:17.000000000 +0200 ++++ Machine.h 2006-05-19 22:12:29.000000000 +0200 +@@ -31,7 +31,7 @@ + { + public: + typedef void (EventHandler::*event_handler)(EventHandler::Event*, +- void *arg = 0); ++ void *arg); + virtual ~Machine() {}; + + static Machine* createMachine(EventHandler*, int& argc, char *argv[], diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild index 02e02c26898b..ff88538d2889 100644 --- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild +++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.7 2006/02/17 22:16:08 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.8 2006/05/19 20:19:58 tupone Exp $ inherit eutils games @@ -21,7 +21,10 @@ S="${WORKDIR}/${PN}-src-${MY_PV}" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${PN}-EventHandler.patch + epatch ${FILESDIR}/${PN}-EventHandler.patch \ + "${FILESDIR}/${P}"-gcc41.patch + sed -i -e "s:-Werror::" \ + configure } src_compile() { |