summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2006-01-03 01:24:26 +0000
committerMark Loeser <halcy0n@gentoo.org>2006-01-03 01:24:26 +0000
commitd87ed880eb08420b4467ed0603c7b3f5541998d6 (patch)
tree4369898b649b9f4a475a8784ceaf8e44e2431808 /games-puzzle
parentmasked for testing (diff)
downloadhistorical-d87ed880eb08420b4467ed0603c7b3f5541998d6.tar.gz
historical-d87ed880eb08420b4467ed0603c7b3f5541998d6.tar.bz2
historical-d87ed880eb08420b4467ed0603c7b3f5541998d6.zip
Add patch to fix compilation on gcc-4, thanks to Diego Pettenò <flameeyes@gentoo.org>; bug #106406
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/flobopuyo/ChangeLog9
-rw-r--r--games-puzzle/flobopuyo/Manifest17
-rw-r--r--games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch25
-rw-r--r--games-puzzle/flobopuyo/flobopuyo-0.20.ebuild9
4 files changed, 52 insertions, 8 deletions
diff --git a/games-puzzle/flobopuyo/ChangeLog b/games-puzzle/flobopuyo/ChangeLog
index 647921305f61..39a936d7710e 100644
--- a/games-puzzle/flobopuyo/ChangeLog
+++ b/games-puzzle/flobopuyo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-puzzle/flobopuyo
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/ChangeLog,v 1.4 2004/12/28 15:47:20 josejx Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/ChangeLog,v 1.5 2006/01/03 01:24:25 halcy0n Exp $
+
+ 03 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+ +files/flobopuyo-0.20-gcc4.patch, flobopuyo-0.20.ebuild:
+ Add patch to fix compilation on gcc-4, thanks to Diego Pettenò
+ <flameeyes@gentoo.org>; bug #106406
29 Dec 2004; Joseph Jezak <josejx@gentoo.org> flobopuyo-0.20.ebuild:
Marked ppc stable.
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
index f655bceed740..e5fd1c8d7b57 100644
--- a/games-puzzle/flobopuyo/Manifest
+++ b/games-puzzle/flobopuyo/Manifest
@@ -1,4 +1,15 @@
-MD5 cf23bdbb3397c2c0e023e40bfd3ec740 ChangeLog 718
-MD5 3a5c2df4dac10b45f6afcc16742c63ed flobopuyo-0.20.ebuild 1012
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d61dcc341cb0b7b1b03b247ec41b398a ChangeLog 931
MD5 be0bda1e61a418231b438f1d8ac57d2a files/digest-flobopuyo-0.20 64
+MD5 bb8afd6e04bde08fd33e22c466674878 files/flobopuyo-0.20-gcc4.patch 967
+MD5 bdf1e2eaa2d3ee101caa03e734c129a2 flobopuyo-0.20.ebuild 1060
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDudJeCRZPokWLroQRAlW7AKDJKmdC79L9A5MqOK6nI/syz7kFRgCePJMi
+FojI275OONUEBovzAjPm4Oo=
+=4QzL
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
new file mode 100644
index 000000000000..6c5d39445a4c
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
@@ -0,0 +1,25 @@
+Index: flobopuyo-0.20/IosVector.cpp
+===================================================================
+--- flobopuyo-0.20.orig/IosVector.cpp
++++ flobopuyo-0.20/IosVector.cpp
+@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()
+ void IosVector::dumpVector() const {
+ fprintf(stderr, "Size: %d\n", getSize());
+ for (int i = 0, j = getSize() ; i < j ; i++)
+- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
+ fprintf(stderr, "\n");
+ }
+Index: flobopuyo-0.20/PuyoGame.cpp
+===================================================================
+--- flobopuyo-0.20.orig/PuyoGame.cpp
++++ flobopuyo-0.20/PuyoGame.cpp
+@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
+ return (PuyoState)newItem;
+ }
+ else
+- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
+ }
+
+ PuyoPuyo::PuyoPuyo(PuyoState state)
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
index 11bb79e22954..fe194f9ddd0a 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild,v 1.4 2004/12/28 15:47:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild,v 1.5 2006/01/03 01:24:26 halcy0n Exp $
-inherit toolchain-funcs games
+inherit toolchain-funcs games eutils
DESCRIPTION="Clone of the famous PuyoPuyo game"
HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
@@ -21,6 +21,9 @@ DEPEND="media-libs/libsdl
src_unpack() {
unpack ${A}
cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-gcc4.patch
+
find . -type f -name ".*" -exec rm -f \{\} \;
sed -i \
-e "s:^DATADIR=.*:DATADIR=\"${GAMES_DATADIR}/${PN}\":" \