summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-11-06 06:19:12 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-11-06 06:19:12 +0000
commit8aaf8b6af011809273177d7e766b7913451d313f (patch)
tree2db51a05b57b8e2a1854cc02be5a795ba2f3c2cb /games-board/knights
parentrelease the new libtool tag guess fix #67692 (Manifest recommit) (diff)
downloadgentoo-2-8aaf8b6af011809273177d7e766b7913451d313f.tar.gz
gentoo-2-8aaf8b6af011809273177d7e766b7913451d313f.tar.bz2
gentoo-2-8aaf8b6af011809273177d7e766b7913451d313f.zip
gcc34 patch from Andrew Kirilenko via bug #69382
Diffstat (limited to 'games-board/knights')
-rw-r--r--games-board/knights/ChangeLog6
-rw-r--r--games-board/knights/files/0.6-gcc34.patch26
-rw-r--r--games-board/knights/knights-0.6.ebuild11
3 files changed, 40 insertions, 3 deletions
diff --git a/games-board/knights/ChangeLog b/games-board/knights/ChangeLog
index 89a71517761e..f2964f7af6b9 100644
--- a/games-board/knights/ChangeLog
+++ b/games-board/knights/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/knights
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/knights/ChangeLog,v 1.6 2004/08/07 15:22:32 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/knights/ChangeLog,v 1.7 2004/11/06 06:19:12 mr_bones_ Exp $
+
+ 05 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/0.6-gcc34.patch,
+ knights-0.6.ebuild:
+ gcc34 patch from Andrew Kirilenko via bug #69382
07 Aug 2004; Tom Martin <slarti@gentoo.org> knights-0.6.ebuild:
Marked ~amd64; resolving 59658.
diff --git a/games-board/knights/files/0.6-gcc34.patch b/games-board/knights/files/0.6-gcc34.patch
new file mode 100644
index 000000000000..2cdf7fff1383
--- /dev/null
+++ b/games-board/knights/files/0.6-gcc34.patch
@@ -0,0 +1,26 @@
+--- knights/core.cpp.ori 2003-03-02 12:34:04.000000000 +0200
++++ knights/core.cpp 2004-09-24 15:07:06.000000000 +0300
+@@ -90,7 +90,7 @@
+ else
+ {
+ /* Use an existing internetIO */
+- (io_base*)internetioPtr = myIOMap.find(Null);
++ internetioPtr = (io_internet *)myIOMap.find(Null);
+ if( internetioPtr == NULL )
+ {
+ kdWarning() << "core::createNewIO: Trying to connect a match to an internetIO that doesn't exsist." << endl;
+@@ -114,12 +114,12 @@
+ }
+ else
+ {
+- (io_base*)internetioPtr = myIOMap.find(ID);
++ internetioPtr = (io_internet *)myIOMap.find(ID);
+ if( internetioPtr == NULL )
+ {
+ /* no io mapped to the ID yet, use the internetio */
+ /* Use an existing internetIO */
+- (io_base*)internetioPtr = myIOMap.find(Null);
++ internetioPtr = (io_internet *)myIOMap.find(Null);
+ if( internetioPtr == NULL )
+ {
+ kdWarning() << "core::createNewIO: Trying to connect a match to an internetIO that doesn't exsist." << endl;
diff --git a/games-board/knights/knights-0.6.ebuild b/games-board/knights/knights-0.6.ebuild
index a724099bffea..6f53b288ebd4 100644
--- a/games-board/knights/knights-0.6.ebuild
+++ b/games-board/knights/knights-0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/knights/knights-0.6.ebuild,v 1.8 2004/08/15 06:52:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/knights/knights-0.6.ebuild,v 1.9 2004/11/06 06:19:12 mr_bones_ Exp $
inherit kde
need-kde 3
@@ -16,8 +16,15 @@ SLOT="0"
KEYWORDS="x86 ppc sparc amd64"
IUSE=""
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${PV}-gcc34.patch"
+}
+
src_compile() {
./configure \
+ --disable-dependency-tracking \
--datadir="${KDEDIR}" \
|| die "./configure failed"
emake || die "emake failed"
@@ -28,5 +35,5 @@ src_install() {
cd ../${PN}-themepack || die "Themes seem to be missing."
insinto ${KDEDIR}/share/apps/knights/themes/
- doins *.tar.gz
+ doins *.tar.gz || die "doins failed"
}