Add patch to fix compilation with gcc-4.3 by Dennis Schridde, bug #213134

Package-Manager: portage-2.1.4.4

4 files changed, 139 insertions, 7 deletions

diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index 7b13fa9e3cc7..023a7fc19853 100644
--- a/games-board/qgo/ChangeLog
+++ b/games-board/qgo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/qgo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.28 2007/09/20 22:27:55 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.29 2008/03/19 11:59:04 nyhm Exp $
+
+  19 Mar 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/qgo-1.5.4-gcc43.patch, qgo-1.5.4.ebuild:
+  Add patch to fix compilation with gcc-4.3 by Dennis Schridde, bug #213134
 
   20 Sep 2007; Michael Sterrett <mr_bones_@gentoo.org>
   files/qgo-1.5.4-parallel.patch:
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
index 5a7a1ebde83d..49e191f55808 100644
--- a/games-board/qgo/Manifest
+++ b/games-board/qgo/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qgo-1.5.4-gcc43.patch 3754 RMD160 3f2fb127a34a1193b43514409a78a5ea8ef230f3 SHA1 b8c54d2ade1067f51ca72b6f04415c6fdf14f8c5 SHA256 4f5662c4362a98e2dee388be82e4bf31538ae59fb6956c43b0105a278038bc7f
 AUX qgo-1.5.4-parallel.patch 907 RMD160 389155cf0aba40247889327bcfa4819e43d363d9 SHA1 f276a5ac3cfd75995aeb65b8e19eeacad44db3aa SHA256 47570371bbb11129ad7542fcf24d4b99d9db3fd507f71ce75eadf5b28ce5cebf
 DIST qgo-1.5.1-r1.tar.gz 2335443 RMD160 e92f12d180bd9aba029670b522b4ae4929f275f6 SHA1 2b0987abc01ac254fc75957bcd5159937df15e3e SHA256 5fad22968e8b4274f0d317fc421b524ecdd21f1e9b14e2bfe407b54e8417b09c
 DIST qgo-1.5.4.tar.gz 2427901 RMD160 82e4220c268124774b109d078fa82c65520d4394 SHA1 36a6656780b25c45194fb31db90288b3b199f88f SHA256 1c5dd7171e4da1339b0d95c3f1cfed8a592e6e4b8dc0bf446a5d3fc02e62d014
 EBUILD qgo-1.5.1.ebuild 574 RMD160 5226d018e6560f487f5e3124c49982e06e999367 SHA1 82a5b1489ceb5f089c268d42c3399aec38ed7f36 SHA256 2b87c55a1660c692e7ab02346765b94524b95371863b2dc2c34e092add804096
-EBUILD qgo-1.5.4.ebuild 888 RMD160 dfcf14fe9c4136ad73e534018ceaa4e8b0244081 SHA1 009e901b9b8fa9a08580d394fef1b42412cc6874 SHA256 af1868b74f630bd8fb3914db9366c618b14efe2c1929af1056d6bf1428c11183
-MISC ChangeLog 3569 RMD160 739d5c26731bf3a22dd78c2110865e635bf00ffa SHA1 0b6b911d57a1a623fc81e4247376c28032e3daad SHA256 216ec091981fb1c00eb5771fa3dd6015637fca82aad71bad3997c86ae0e68134
+EBUILD qgo-1.5.4.ebuild 927 RMD160 c862a8362f79dc789f80d2a27a6d0121aa9364fb SHA1 43dd213dcb9fb3be712a92fcc9d080512fbe99fe SHA256 b63f2dd6ebd52f9dc091cfaabbb43307c7d455a87e7ae7de6eb5cfee4d6860f4
+MISC ChangeLog 3739 RMD160 d2fc286b83d78c122f47a9773a8af615ec2bd600 SHA1 8bea03b2efd24ce70b8f27dd7c2dc85be9e83eb6 SHA256 25d8b46d468c4459c83aa654615b9a742f323b67259736badd052f4fa1108f15
 MISC metadata.xml 388 RMD160 cd5534eeca1a07a692717586962a4a26545796dd SHA1 8d74cbab2c30bea8f61092c6cfad96f5501d5e09 SHA256 286a1e0a2fc34628235ea89461009dcf86c04ba05c0fcd35aed6fc433af7d1b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH4QAQdz7hIScOURERAjxdAKCWF8reseX6HjmDtKtv927d8s4rFwCg9lXi
+1WnLp6bupil/bnQc1N2KWjM=
+=9ALS
+-----END PGP SIGNATURE-----
diff --git a/games-board/qgo/files/qgo-1.5.4-gcc43.patch b/games-board/qgo/files/qgo-1.5.4-gcc43.patch
new file mode 100644
index 000000000000..d93f241d5d74
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4-gcc43.patch
@@ -0,0 +1,115 @@
+--- src/matrix.cpp
++++ src/matrix.cpp
+@@ -5,7 +5,7 @@
+ #include "matrix.h"
+ #include <stdlib.h>
+ #ifndef NO_DEBUG
+-#include <iostream.h>
++#include <iostream>
+ #endif
+ 
+ Matrix::Matrix(int s)
+@@ -78,60 +78,60 @@
+ 	
+ 	int i, j;
+ 	
+-	cout << "\n  ";
++	std::cout << "\n  ";
+ 	for (i=0; i<size; i++)
+-		cout << (i+1)%10 << " ";
+-	cout << endl;
++		std::cout << (i+1)%10 << " ";
++	std::cout << endl;
+ 	
+ 	for (i=0; i<size; i++)
+ 	{
+-		cout << (i+1)%10 << " ";
++		std::cout << (i+1)%10 << " ";
+ 		for (j=0; j<size; j++)
+ 		{
+ #if 1
+ 			switch (abs(matrix[j][i]))
+ 			{
+ 			case stoneNone:
+-			case stoneErase: cout << ". "; break;
+-			case stoneBlack: cout << "B "; break;
+-			case stoneWhite: cout << "W "; break;
+-			case markSquare*10: cout << "[ "; break;
+-			case markCircle*10: cout << "O "; break;
+-			case markTriangle*10: cout << "T "; break;
+-			case markCross*10: cout << "X "; break;
+-			case markText*10: cout << "A "; break;
+-			case markNumber*10: cout << "1 "; break;
+-			case markSquare*10+stoneBlack: cout << "S "; break;
+-			case markCircle*10+stoneBlack: cout << "C "; break;
+-			case markTriangle*10+stoneBlack: cout << "D "; break;
+-			case markCross*10+stoneBlack: cout << "R "; break;
+-			case markText*10+stoneBlack: cout << "A "; break;
+-			case markNumber*10+stoneBlack: cout << "N "; break;
+-			case markSquare*10+stoneWhite: cout << "s "; break;
+-			case markCircle*10+stoneWhite: cout << "c "; break;
+-			case markTriangle*10+stoneWhite: cout << "d "; break;
+-			case markCross*10+stoneWhite: cout << "r "; break;
+-			case markText*10+stoneWhite: cout << "a "; break;
+-			case markNumber*10+stoneWhite: cout << "n "; break;
+-			default: cout << "? ";
++			case stoneErase: std::cout << ". "; break;
++			case stoneBlack: std::cout << "B "; break;
++			case stoneWhite: std::cout << "W "; break;
++			case markSquare*10: std::cout << "[ "; break;
++			case markCircle*10: std::cout << "O "; break;
++			case markTriangle*10: std::cout << "T "; break;
++			case markCross*10: std::cout << "X "; break;
++			case markText*10: std::cout << "A "; break;
++			case markNumber*10: std::cout << "1 "; break;
++			case markSquare*10+stoneBlack: std::cout << "S "; break;
++			case markCircle*10+stoneBlack: std::cout << "C "; break;
++			case markTriangle*10+stoneBlack: std::cout << "D "; break;
++			case markCross*10+stoneBlack: std::cout << "R "; break;
++			case markText*10+stoneBlack: std::cout << "A "; break;
++			case markNumber*10+stoneBlack: std::cout << "N "; break;
++			case markSquare*10+stoneWhite: std::cout << "s "; break;
++			case markCircle*10+stoneWhite: std::cout << "c "; break;
++			case markTriangle*10+stoneWhite: std::cout << "d "; break;
++			case markCross*10+stoneWhite: std::cout << "r "; break;
++			case markText*10+stoneWhite: std::cout << "a "; break;
++			case markNumber*10+stoneWhite: std::cout << "n "; break;
++			default: std::cout << "? ";
+ 			}
+ #else
+-			cout << matrix[j][i] << " ";
++			std::cout << matrix[j][i] << " ";
+ #endif
+ 		}
+-		cout << (i+1)%10 << endl;
++		std::cout << (i+1)%10 << endl;
+ 	}
+ 	
+-	cout << "  ";
++	std::cout << "  ";
+ 	for (i=0; i<size; i++)
+-		cout << (i+1)%10 << " ";
+-	cout << endl;
++		std::cout << (i+1)%10 << " ";
++	std::cout << endl;
+ 	
+ 	if (markTexts != NULL && !markTexts->isEmpty())
+ 	{
+-		cout << markTexts->count() << " mark texts in the storage.\n";
++		std::cout << markTexts->count() << " mark texts in the storage.\n";
+ 		for (QStringList::Iterator it=markTexts->begin(); it != markTexts->end(); ++it)
+-			cout << (QString)(*it) << endl;
++			std::cout << (QString)(*it) << endl;
+ 	}
+ }
+ #endif
+--- src/tree.cpp
++++ src/tree.cpp
+@@ -5,7 +5,6 @@
+ #include "tree.h"
+ #include "move.h"
+ #include "qgo.h"
+-#include <iostream.h>
+ #include <qptrstack.h>
+ 
+ Tree::Tree(int board_size)
diff --git a/games-board/qgo/qgo-1.5.4.ebuild b/games-board/qgo/qgo-1.5.4.ebuild
index fbe5eb90030d..2c2ceed188ee 100644
--- a/games-board/qgo/qgo-1.5.4.ebuild
+++ b/games-board/qgo/qgo-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.4.ebuild,v 1.1 2007/06/17 13:42:20 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.4.ebuild,v 1.2 2008/03/19 11:59:04 nyhm Exp $
 
 inherit eutils autotools qt3 games
 
@@ -18,7 +18,9 @@ DEPEND="$(qt_min_version 3.3)"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch \
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	sed -i 's:$(datadir):/usr/share:' \
 		templates/Makefile.in \
 		|| die "sed Makefile.in failed"