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 | 9e311b2a127b9529e42fe371d89ce0ab40b9597e (patch) | |
| tree | fd67c8bae29408ed9e638b8897e3e8ce81987b23 /games-puzzle/magiccube4d | |
| parent | Make sure that the correct includedir and the correct library name is used. S... (diff) | |
| download | gentoo-2-9e311b2a127b9529e42fe371d89ce0ab40b9597e.tar.gz gentoo-2-9e311b2a127b9529e42fe371d89ce0ab40b9597e.tar.bz2 gentoo-2-9e311b2a127b9529e42fe371d89ce0ab40b9597e.zip | |
Fix for gcc-4.1
(Portage version: 2.1_rc1-r2)
Diffstat (limited to 'games-puzzle/magiccube4d')
| -rw-r--r-- | games-puzzle/magiccube4d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch | 22 | ||||
| -rw-r--r-- | games-puzzle/magiccube4d/magiccube4d-2.2.ebuild | 7 |
3 files changed, 32 insertions, 3 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/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() { |