summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-07-27 18:04:51 +0000
committerTristan Heaven <tristan@gentoo.org>2009-07-27 18:04:51 +0000
commit58c9538e2dc449439dc0b5538890df388e835a93 (patch)
tree86a65659e65ea19af89e6f41f09a7b35b6c953e6 /games-arcade
parentNeed ~ dep for kvm-kmod, to handle -r bumps (diff)
downloadhistorical-58c9538e2dc449439dc0b5538890df388e835a93.tar.gz
historical-58c9538e2dc449439dc0b5538890df388e835a93.tar.bz2
historical-58c9538e2dc449439dc0b5538890df388e835a93.zip
Fix building with gcc-4.4, bug #273505
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/holotz-castle/ChangeLog6
-rw-r--r--games-arcade/holotz-castle/Manifest15
-rw-r--r--games-arcade/holotz-castle/files/holotz-castle-1.3.10-gcc44.patch11
-rw-r--r--games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild9
4 files changed, 34 insertions, 7 deletions
diff --git a/games-arcade/holotz-castle/ChangeLog b/games-arcade/holotz-castle/ChangeLog
index d5397370f455..00dda9423595 100644
--- a/games-arcade/holotz-castle/ChangeLog
+++ b/games-arcade/holotz-castle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/holotz-castle
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/ChangeLog,v 1.9 2009/02/02 09:43:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/ChangeLog,v 1.10 2009/07/27 18:04:51 nyhm Exp $
+
+ 27 Jul 2009; Tristan Heaven <nyhm@gentoo.org> holotz-castle-1.3.10.ebuild,
+ +files/holotz-castle-1.3.10-gcc44.patch:
+ Fix building with gcc-4.4, bug #273505
02 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
files/holotz-castle-1.3.10-build.patch, holotz-castle-1.3.10.ebuild:
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
index 7e96181da9c7..1a8623da00be 100644
--- a/games-arcade/holotz-castle/Manifest
+++ b/games-arcade/holotz-castle/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX holotz-castle-1.3.10-build.patch 2177 RMD160 3a55c15d0dc3171b30eaa9c57e5aa2fab1b27ff9 SHA1 e391b0c410cc2ee4edc91c851284b524fbf93888 SHA256 f3dd073cf64d9cf56bdae5293aac955bc2e522e9e3764b786c84a353ecec1d80
+AUX holotz-castle-1.3.10-gcc44.patch 288 RMD160 da05067f92c8eb0059211f91f21030ce9e6fe72c SHA1 68fe59d3e944e04177f021f47a80a70e65c6d5e6 SHA256 83252946e22a98cb7b494fc8aa0cd97dcdac573a1aad5af3b2fcf5f637a5875f
DIST holotz-castle-1.3.10-src.tar.gz 3666272 RMD160 450363c840ff56ac72b0c2731d352269769cd6c4 SHA1 405e69778233920c155a29d9ef490a8bdada31af SHA256 6333d7bfba2952dd17127a4564b0f680ada177a46f5aed4282a283fe3cd6fedb
-EBUILD holotz-castle-1.3.10.ebuild 1063 RMD160 734e850597b58e0a55558c5dc5a659a48c1ee2ec SHA1 d7d888556817492190e4b0091f2d4342f8958268 SHA256 2fc35388da7eb9631257aca5ce3b0e8ec0bd3ca405d7d7b006584499a317aa4d
-MISC ChangeLog 1579 RMD160 d0647512525845f14e123cc6cd56b12b76554480 SHA1 19680b687546dec392b675088c2dfde706326a1d SHA256 1a756a262b54f32ddc6601a22e2f025220e5d97f8e269594e48dd0b3b93cc6c1
+EBUILD holotz-castle-1.3.10.ebuild 1080 RMD160 a58feb0cb878b624f70eea69ea10f94102365d7e SHA1 d9e333f487e27c747418a341ca5bfd2db6daa652 SHA256 eff6832a60ffe76911630a691bb3ed5dcc9953a68421f4e134f0562c90b2e39b
+MISC ChangeLog 1740 RMD160 5ba93b4ae7ea62c3d4009d103d086255abbdd9bc SHA1 a35ebce1f99cba7e0908cc1ea20c205d2b197a78 SHA256 d78e7f62ce73adf898dea0487a02fa67389eb51accaf8592de5299875bbbbb3f
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpt7EkACgkQdz7hIScOURH3VgCgvXHb+TjCKAokZJDHX29pFrdj
+eBYAnRyXEXhjYJcJnKmPlOneuuXrl3wc
+=9Kim
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.10-gcc44.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.10-gcc44.patch
new file mode 100644
index 000000000000..0c3af53591bf
--- /dev/null
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.10-gcc44.patch
@@ -0,0 +1,11 @@
+--- JLib/JLib/Util/JFS.cpp
++++ JLib/JLib/Util/JFS.cpp
+@@ -887,7 +887,7 @@
+
+ // Si es un directorio lo importa recursivamente
+ struct dirent64 **namelist;
+- n = scandir64(filename, &namelist, 0, alphasort);
++ n = scandir64(filename, &namelist, 0, alphasort64);
+
+ if (n < 0)
+ {
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
index fa4de0ba4a00..80bd5770ef59 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild,v 1.4 2009/02/02 09:43:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/holotz-castle/holotz-castle-1.3.10.ebuild,v 1.5 2009/07/27 18:04:51 nyhm Exp $
EAPI=2
inherit eutils games
@@ -22,9 +22,10 @@ DEPEND="virtual/opengl
S=${WORKDIR}/${P}-src
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-gcc44.patch
+)
src_compile() {
emake -C JLib CPU_OPTS="${CXXFLAGS}" || die "emake failed"