diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-07-28 15:18:29 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-07-28 15:18:29 +0000 |
| commit | 426c0370b23ae50402a852bd71095c351d321efa (patch) | |
| tree | a679d09dcbe4d8072d85133607f4675d7270c126 /games-puzzle/candycrisis | |
| parent | Added patch and fixes to ebuild to remove several install location snafus. (diff) | |
| download | gentoo-2-426c0370b23ae50402a852bd71095c351d321efa.tar.gz gentoo-2-426c0370b23ae50402a852bd71095c351d321efa.tar.bz2 gentoo-2-426c0370b23ae50402a852bd71095c351d321efa.zip | |
Fix building with gcc-4.4, bug #273575
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'games-puzzle/candycrisis')
| -rw-r--r-- | games-puzzle/candycrisis/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/candycrisis/candycrisis-1.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | games-puzzle/candycrisis/files/candycrisis-1.0-gcc44.patch | 11 |
3 files changed, 22 insertions, 5 deletions
diff --git a/games-puzzle/candycrisis/ChangeLog b/games-puzzle/candycrisis/ChangeLog index 820e12caa74c..0bc17f312bc3 100644 --- a/games-puzzle/candycrisis/ChangeLog +++ b/games-puzzle/candycrisis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/candycrisis -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/candycrisis/ChangeLog,v 1.4 2008/06/23 07:30:21 opfer Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/candycrisis/ChangeLog,v 1.5 2009/07/28 15:18:29 nyhm Exp $ + + 28 Jul 2009; Tristan Heaven <nyhm@gentoo.org> candycrisis-1.0-r1.ebuild, + +files/candycrisis-1.0-gcc44.patch: + Fix building with gcc-4.4, bug #273575 23 Jun 2008; Christian Faulhammer <opfer@gentoo.org> candycrisis-1.0-r1.ebuild: diff --git a/games-puzzle/candycrisis/candycrisis-1.0-r1.ebuild b/games-puzzle/candycrisis/candycrisis-1.0-r1.ebuild index ef9e9c25de92..445694e9a460 100644 --- a/games-puzzle/candycrisis/candycrisis-1.0-r1.ebuild +++ b/games-puzzle/candycrisis/candycrisis-1.0-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-puzzle/candycrisis/candycrisis-1.0-r1.ebuild,v 1.2 2008/06/23 07:30:21 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/candycrisis/candycrisis-1.0-r1.ebuild,v 1.3 2009/07/28 15:18:29 nyhm Exp $ inherit eutils games @@ -24,7 +24,9 @@ S=${WORKDIR}/CandyCrisis/Source src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch \ + "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-gcc44.patch sed -i \ -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}/:g" \ main.cpp \ diff --git a/games-puzzle/candycrisis/files/candycrisis-1.0-gcc44.patch b/games-puzzle/candycrisis/files/candycrisis-1.0-gcc44.patch new file mode 100644 index 000000000000..b454d82ace17 --- /dev/null +++ b/games-puzzle/candycrisis/files/candycrisis-1.0-gcc44.patch @@ -0,0 +1,11 @@ +--- CandyCrisis/Source/RegAlgorithm.cpp ++++ CandyCrisis/Source/RegAlgorithm.cpp +@@ -184,7 +184,7 @@ + {
+ // Convert the key (a jumble of letters like BFGJ-TVFF) into a 32-bit
+ // hex value.
+- char* unscrambled[8];
++ const char* unscrambled[8];
+ int index;
+ unsigned int value = 0;
+
|