diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-07-28 15:18:29 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-07-28 15:18:29 +0000 |
| commit | ecc152c12f98d77681740fb69ee1298e766c2fcd (patch) | |
| tree | 462e2c674179fd0cc3ca4b8141e90f4843aa1350 /games-puzzle | |
| parent | Added patch and fixes to ebuild to remove several install location snafus. (diff) | |
| download | historical-ecc152c12f98d77681740fb69ee1298e766c2fcd.tar.gz historical-ecc152c12f98d77681740fb69ee1298e766c2fcd.tar.bz2 historical-ecc152c12f98d77681740fb69ee1298e766c2fcd.zip | |
Fix building with gcc-4.4, bug #273575
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/candycrisis/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/candycrisis/Manifest | 13 | ||||
| -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 |
4 files changed, 29 insertions, 11 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/Manifest b/games-puzzle/candycrisis/Manifest index fc29afa129c0..dd303ad13dbb 100644 --- a/games-puzzle/candycrisis/Manifest +++ b/games-puzzle/candycrisis/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX candycrisis-1.0-gcc44.patch 319 RMD160 f854b986f7d26c5549fb8017ee8b58b392662b56 SHA1 8fabe944a723c715f62e836c044f69044b964308 SHA256 16cac2d16a3eaf4aa700f55eccd850c29817a856ec7cf93f368e5b801cb850f5 AUX candycrisis-1.0-gentoo.patch 2583 RMD160 955fa27a0a314a70268a6e0e49255e3e23073770 SHA1 ec2dbe26a7d0fd660cc1dfbe09214306d79b4f39 SHA256 edfac0bedd63e909bb8daada0d09e82688a0d2cd0590b801201bb4432ec3528d DIST candycrisis-1.0.zip 5910242 RMD160 180536a9cf262f7f07fc15150639c9b499967fc9 SHA1 41cff7e371219d8dc1fcf2aab2b65a1da2eeb855 SHA256 7044b56afae9ccae28c11dc58cfdce9c92b520f468641083bc461cdb5e14da8a -EBUILD candycrisis-1.0-r1.ebuild 1074 RMD160 5e1e1a2d8ce5db14ff160c2f6d9eee448418bf1f SHA1 c32c48c09fb3c71a02c357fc60eb57107ba6c23c SHA256 e5bbcd099a23d835b05e32bc8ea80733ad7d173cfa8d91ccd4a60aaebd0c71e4 -MISC ChangeLog 883 RMD160 f5e425070c4d5fd156f09dd9981bc000a82b4fd5 SHA1 d682bf74fa153f2cec70f6c78689c43ad6be464f SHA256 772bfd062c36e938388010ccc0bc89e033b1313a2eb01227aed37b126ba73459 +EBUILD candycrisis-1.0-r1.ebuild 1112 RMD160 874565fd4b65cdee34891ee2d3ce5694460a0437 SHA1 a645e9be3d0ab75cffb08f8312d8c9d701e04ed8 SHA256 8ef9e30785eaf02be96149165b470dfc3e07ca0e322a7f74dc3a8ab94966ea75 +MISC ChangeLog 1037 RMD160 8b15ef4d2040e4fa48b0c1c3fe5355065a42306e SHA1 4b2df3686d84dad5d30176a737d0e5074b8f2ce3 SHA256 8e40916edebdbbc069ff5a4f263ab63a09246e891db3b66dafbf39115173dda0 MISC metadata.xml 761 RMD160 275afc69be6d287ff84ffda90bdff0e91c08ce8b SHA1 80f0d6f8fdbd8549140c890939ce1266ab8c95b0 SHA256 1f5c7fa688552d7cf3360a282684b77731d44cac753395aa02d58a76ca34362e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkhfURIACgkQNQqtfCuFneNq8gCeJApwNEnZ7CmPU74F/iF4s/nM -XS4Anj2niIGWpLsJsrmrDBncYTeTmsq3 -=NY/0 +iEYEARECAAYFAkpvFssACgkQdz7hIScOURHwAQCg9wlCdeMSGCqn6xtKaVsgY9kX +bL4AoLoqcl1eahrWWYj14y6oJ2Cly4pW +=BYID -----END PGP SIGNATURE----- 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;
+
|