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
commita3f04dc3d124489e4cce2b6aa1647a809b6974e1 (patch)
treed7f5a1f7fcb65f7eb08d124bc2f6e54e82b9a6ee
parentFixed gcc 3.4 compile problems and added ~ppc. (diff)
downloadhistorical-a3f04dc3d124489e4cce2b6aa1647a809b6974e1.tar.gz
historical-a3f04dc3d124489e4cce2b6aa1647a809b6974e1.tar.bz2
historical-a3f04dc3d124489e4cce2b6aa1647a809b6974e1.zip
Fixed compiling with gcc 3.4 and added ~ppc.
-rw-r--r--games-strategy/freelords/ChangeLog6
-rw-r--r--games-strategy/freelords/Manifest7
-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
4 files changed, 24 insertions, 7 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/Manifest b/games-strategy/freelords/Manifest
index 457c8109a88e..c03ad0d7cddd 100644
--- a/games-strategy/freelords/Manifest
+++ b/games-strategy/freelords/Manifest
@@ -1,5 +1,6 @@
-MD5 c500f41f29edd2b7639f7f75345f0490 freelords-0.3.3.ebuild 1382
+MD5 3bad1c7d8a6af41d7bd476a208cb5d54 ChangeLog 1637
+MD5 fdc0e71c1e330d4ec0e3529344d79b16 freelords-0.3.3.ebuild 1430
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 8007573205826db32d26cff25d9dfcfd ChangeLog 1480
-MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147
MD5 847bea9f1eb22873a23e5b4f40dcab30 files/digest-freelords-0.3.3 68
+MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147
+MD5 fa26afec1f59a2cca205ade604bfdf96 files/freelords-0.3.3-gcc-3.4.patch 459
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() {