gcc34 patch from Andrew Kirilenko via bug #69382

diff --git a/games-board/knights/ChangeLog b/games-board/knights/ChangeLog
index 89a71517761e7635cd16fe96d59649a797f71d36..f2964f7af6b9c1e87836d80bde25d7e0810c0b20 100644 (file)
--- 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/Manifest b/games-board/knights/Manifest
index b396eeda6515eb1a137bcd995aa2570118cc2e1f..f26b867f8d31970469357599f8300816f1d1162b 100644 (file)
--- a/games-board/knights/Manifest
+++ b/games-board/knights/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5f15ac30f722c29f5b3fa71dbe30724d ChangeLog 1840
-MD5 624453247077cadb03703fff226a27a3 knights-0.6.ebuild 828
+MD5 f30385f3484064e653ac788993f46467 ChangeLog 1996
+MD5 68153553807aa8d0f49aadca518d7dfe knights-0.6.ebuild 969
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 07662ec2f6b1ae54cc4f16c83f9cc114 files/0.6-gcc34.patch 1138
 MD5 14dd7b0024f0b5d7447f3f62332e5633 files/digest-knights-0.6 140
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHwiEHTu7gpaalycRAiu6AJsEZAjZJPGFlPQXsyLRAzzuZzN9sgCfVhui
-dDw0e+Hn2BWbIUFgl8wBo78=
-=4sZG
------END PGP SIGNATURE-----

diff --git a/games-board/knights/files/0.6-gcc34.patch b/games-board/knights/files/0.6-gcc34.patch
new file mode 100644 (file)
index 0000000..2cdf7ff
--- /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 a724099bffea76757c5b6d85e4c82935d52a2fc6..6f53b288ebd48e86ddc2f65f98b99b994dd93736 100644 (file)
--- 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"
 }