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

(Portage version: 2.1.4.4)

3 files changed, 126 insertions, 5 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/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"