summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2004-11-08 02:13:17 +0000
committerJoseph Jezak <josejx@gentoo.org>2004-11-08 02:13:17 +0000
commit31ed2d3816d27fd4cb1083f5bda4003414c3c725 (patch)
treecc8ce6c96ec301b6d965db715fc4aff9349e0ba6 /games-strategy/freelords
parentFixed gcc 3.4 compile problems and added ~ppc. (Manifest recommit) (diff)
downloadgentoo-2-31ed2d3816d27fd4cb1083f5bda4003414c3c725.tar.gz
gentoo-2-31ed2d3816d27fd4cb1083f5bda4003414c3c725.tar.bz2
gentoo-2-31ed2d3816d27fd4cb1083f5bda4003414c3c725.zip
Fixed compiling with gcc 3.4 and added ~ppc.
Diffstat (limited to 'games-strategy/freelords')
-rw-r--r--games-strategy/freelords/ChangeLog6
-rw-r--r--games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch11
-rw-r--r--games-strategy/freelords/freelords-0.3.3.ebuild7
3 files changed, 20 insertions, 4 deletions
diff --git a/games-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog
index 8e97e0088f5f..00db7db3319c 100644
--- a/games-strategy/freelords/ChangeLog
+++ b/games-strategy/freelords/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/freelords
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.11 2004/09/24 08:30:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.12 2004/11/08 02:13:17 josejx Exp $
+
+ 08 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+ +files/freelords-0.3.3-gcc-3.4.patch, freelords-0.3.3.ebuild:
+ Fixed compiling with gcc 3.4 and added ~ppc.
24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> freelords-0.3.3.ebuild:
tidy deps: doesn't like media-libs/paragui-1.1
diff --git a/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch b/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch
new file mode 100644
index 000000000000..702bc99bf028
--- /dev/null
+++ b/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch
@@ -0,0 +1,11 @@
+--- src/ObjectList.cpp.old 2004-11-05 07:17:55.928861736 +0000
++++ src/ObjectList.cpp 2004-11-05 07:06:58.624787144 +0000
+@@ -27,7 +27,7 @@
+
+ template<class T> T* ObjectList<T>::getObjectAt(int x, int y)
+ {
+- for (typename ObjectList<T>::iterator it = begin(); it != end(); ++it)
++ for (typename ObjectList<T>::iterator it = this->begin(); it != this->end(); ++it)
+ {
+ PG_Point p = (*it).getPos();
+ int size = (*it).getSize() - 1;
diff --git a/games-strategy/freelords/freelords-0.3.3.ebuild b/games-strategy/freelords/freelords-0.3.3.ebuild
index 172434d96df6..e1a44a51cdb5 100644
--- a/games-strategy/freelords/freelords-0.3.3.ebuild
+++ b/games-strategy/freelords/freelords-0.3.3.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.3.ebuild,v 1.3 2004/09/24 08:30:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.3.ebuild,v 1.4 2004/11/08 02:13:17 josejx Exp $
-inherit games
+inherit eutils games
DESCRIPTION="Free Warlords clone"
HOMEPAGE="http://www.freelords.org/"
SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
LICENSE="GPL-2"
SLOT="0"
IUSE="nls"
@@ -33,6 +33,7 @@ src_unpack() {
sed -i \
-e "s:\$(prefix)/share/locale:/usr/share/locale:" src/Makefile.in \
|| die "sed src/Makefile.in failed"
+ epatch ${FILESDIR}/${P}-gcc-3.4.patch
}
src_compile() {