Fix build with gcc-4.5 Bug #322263

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 88 insertions, 4 deletions

diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index f3deb36aa97f..9fd6c9ff0b40 100644
--- a/games-board/qgo/ChangeLog
+++ b/games-board/qgo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/qgo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.41 2010/05/20 14:01:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.42 2010/06/01 08:13:45 tupone Exp $
+
+  01 Jun 2010; Tupone Alfredo <tupone@gentoo.org>
+  qgo-1.5.4_p20100322.ebuild, +files/qgo-1.5.4_p20100322-gcc45.patch:
+  Fix build with gcc-4.5 Bug #322263 by flameeyes@gentoo.org
 
   20 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   qgo-1.5.4_p20100322.ebuild:
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
index a57a2390a3c5..f3463ee8e5d9 100644
--- a/games-board/qgo/Manifest
+++ b/games-board/qgo/Manifest
@@ -1,4 +1,5 @@
+AUX qgo-1.5.4_p20100322-gcc45.patch 2831 RMD160 efca30583201e5805f67e1bfd415d78715d816bb SHA1 10b77f27a3031bd44e15d5047b129835354eda63 SHA256 cc613683d89c684e58f4cf3368a342b15af227f569f4c761976e314bcea3466c
 DIST qgo-1.5.4_p20100322.tar.bz2 2486631 RMD160 6b729aa7e41465a88c5133cdbda77c152a15e6d5 SHA1 a90abea81f658cf4c357e559ca87d597ac976deb SHA256 08848ef8fc05b0f32ec730f0ac0e7123224e8b69f251ef9aeb711c9a2fceefa9
-EBUILD qgo-1.5.4_p20100322.ebuild 1052 RMD160 37a4554393c28e8fff95f1978d39014501652486 SHA1 dc4e033414b3790f6427d9fd12852f3afe2c0596 SHA256 daabfaca153c8fe3d17b8929d0411e67031fac3fcd05fbe55660a123a0d518f4
-MISC ChangeLog 574 RMD160 40cde28d3841229461e806e8f7499fde490e7f01 SHA1 abb2d4b126a47c67d823e5ca45643aed2b58640e SHA256 ce30263ff6fe921fe1609e1a404142d8aac52ab62d73908dca4327f028d50f16
+EBUILD qgo-1.5.4_p20100322.ebuild 1089 RMD160 0574e6eb5fd8f944ae621178b348d65b96fc1351 SHA1 d52ee17047f10d5afebb788487eb0108eb130c80 SHA256 2ae6537ff280ef17a06f7323c6cec0caa9839794c6ec539abbcfd31665febb98
+MISC ChangeLog 753 RMD160 9a2da5b06d6647cba7e7eeea2c70e94538babfe5 SHA1 bd9a44644f181956cca32a21fe1533d93a5c3a8b SHA256 dd67eca20a96d253a35d4d444d4c11131ae0d04007b6df8ccd2324232b437dc6
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
new file mode 100644
index 000000000000..53c8509bc255
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
@@ -0,0 +1,77 @@
+--- src/board/board.cpp.old	2010-06-01 08:20:32.000000000 +0200
++++ src/board/board.cpp	2010-06-01 08:20:54.000000000 +0200
+@@ -347,7 +347,7 @@
+ 		}
+ 
+ 	//redraws the image on a brush to set the background
+-	canvas->setBackgroundBrush ( QBrush::QBrush(image));
++	canvas->setBackgroundBrush ( QBrush(image));
+ 
+ }
+ 
+--- src/board/clockdisplay.cpp.old	2010-06-01 08:31:10.000000000 +0200
++++ src/board/clockdisplay.cpp	2010-06-01 08:31:38.000000000 +0200
+@@ -274,13 +274,13 @@
+ 
+ 	if(b_time > 3600 || w_time > 3600)
+ 	{
+-		bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
+-		wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
++		bt = QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
++		wt = QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
+ 	}
+ 	else
+ 	{
+-		bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
+-		wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
++		bt = QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
++		wt = QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
+ 	}
+ 	
+ 	switch(timeSystem)
+--- src/gtp/qgtp.cpp.old	2010-06-01 08:34:09.000000000 +0200
++++ src/gtp/qgtp.cpp	2010-06-01 08:34:28.000000000 +0200
+@@ -341,7 +341,7 @@
+ 	_cpt++;
+ 
+ 	qDebug("flush -> %s",s);
+-	uint i= programProcess->write(QByteArray::QByteArray(s));
++	uint i= programProcess->write(QByteArray(s));
+ 
+ //	int j= programProcess->waitForBytesWritten ( 100 );
+ 
+--- src/board/imagehandler.cpp.old	2010-06-01 08:34:55.000000000 +0200
++++ src/board/imagehandler.cpp	2010-06-01 08:35:17.000000000 +0200
+@@ -93,8 +93,8 @@
+ 	{
+ 		altGhostPixmaps = new QList<QPixmap>();//::QList();
+ 
+-		QPixmap alt1 = QPixmap::QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
+-		QPixmap alt2 = QPixmap:: QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
++		QPixmap alt1 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
++		QPixmap alt2 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
+ 
+ 		if (alt1.isNull() || alt2.isNull())
+ 			qFatal("Could not load alt_ghost pixmaps.");
+--- src/board/mark.cpp.old	2010-06-01 08:36:39.000000000 +0200
++++ src/board/mark.cpp	2010-06-01 08:36:51.000000000 +0200
+@@ -109,7 +109,7 @@
+ 		setPen(QPen(col, 2));
+ //	else
+ 
+-	pa = QPolygon::QPolygon(3);
++	pa = QPolygon(3);
+ 
+ //		setPen(QPen(col, 1));
+ 	setSize(s, s);
+--- src/network/gamedialog.cpp.old	2010-06-01 08:45:26.000000000 +0200
++++ src/network/gamedialog.cpp	2010-06-01 08:45:40.000000000 +0200
+@@ -1123,7 +1123,7 @@
+ 	 * probably FIXME, I just wonder why its like that in the first place */
+ 	
+ 	QPalette p(QApplication::palette());
+-	p.setColor(  QPalette::Base , QColor::QColor("cyan"));
++	p.setColor(  QPalette::Base , QColor("cyan"));
+ 	
+ 	qDebug("GameDialog::recvRequest");
+ 	/* If there's no existing request, then nothing should have changed
diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
index c1eb08b989af..5a511998d869 100644
--- a/games-board/qgo/qgo-1.5.4_p20100322.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p20100322.ebuild,v 1.4 2010/05/20 14:01:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.4_p20100322.ebuild,v 1.5 2010/06/01 08:13:45 tupone Exp $
 
 EAPI=2
 inherit qt4-r2 games
@@ -29,6 +29,8 @@ src_prepare() {
 	sed -i \
 		-e "/TRANSLATIONS_PATH_PREFIX/s:/usr/share:${GAMES_DATADIR}:" \
 		src/defines.h || die
+
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {