Fix build with qt-4.7 Bug #338502

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

4 files changed, 87 insertions, 16 deletions

diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index 9fd6c9ff0b40..cbecc65555a5 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.42 2010/06/01 08:13:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.43 2010/11/08 13:50:09 tupone Exp $
+
+  08 Nov 2010; Tupone Alfredo <tupone@gentoo.org>
+  qgo-1.5.4_p20100322.ebuild, +files/qgo-1.5.4_p20100322-qt47.patch:
+  Fix build with qt-4.7 Bug #338502 by flameeyes@gentoo.org
 
   01 Jun 2010; Tupone Alfredo <tupone@gentoo.org>
   qgo-1.5.4_p20100322.ebuild, +files/qgo-1.5.4_p20100322-gcc45.patch:
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
index 72302b611a92..b6428834b9a0 100644
--- a/games-board/qgo/Manifest
+++ b/games-board/qgo/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qgo-1.5.4_p20100322-gcc45.patch 2831 RMD160 efca30583201e5805f67e1bfd415d78715d816bb SHA1 10b77f27a3031bd44e15d5047b129835354eda63 SHA256 cc613683d89c684e58f4cf3368a342b15af227f569f4c761976e314bcea3466c
+AUX qgo-1.5.4_p20100322-qt47.patch 2226 RMD160 f0decde9cbf5ba6ad7c9ed883519bc6536034f49 SHA1 7eb52ffc08154a863d6b7ed259af614be690711f SHA256 16e2861010da7b5f62436701ae1ba0d029d4b89cc67249cbe0841b276d20b721
 DIST qgo-1.5.4_p20100322.tar.bz2 2486631 RMD160 6b729aa7e41465a88c5133cdbda77c152a15e6d5 SHA1 a90abea81f658cf4c357e559ca87d597ac976deb SHA256 08848ef8fc05b0f32ec730f0ac0e7123224e8b69f251ef9aeb711c9a2fceefa9
-EBUILD qgo-1.5.4_p20100322.ebuild 1094 RMD160 4b22201875e5016364e75f01fe1430b62c531320 SHA1 70e679632e13854e1521d56d0c673a882ff2441f SHA256 24235c8f48742c2909238e9260b8ab2e9afeb28f26b84eb76ebd2878a2609cf7
-MISC ChangeLog 753 RMD160 9a2da5b06d6647cba7e7eeea2c70e94538babfe5 SHA1 bd9a44644f181956cca32a21fe1533d93a5c3a8b SHA256 dd67eca20a96d253a35d4d444d4c11131ae0d04007b6df8ccd2324232b437dc6
+EBUILD qgo-1.5.4_p20100322.ebuild 1151 RMD160 4d8a062e29fb6c9dee8462d4bddaf811c775c96e SHA1 f4f5fc0dde74f6a62abdf74a5dbc87a22413283d SHA256 289877078f8d4a0e248e81a53897dbc375ac64a9d4cdc9685c1db4ae1d0a9d2d
+MISC ChangeLog 933 RMD160 961e4e2e40980fba972026f302da00441589615d SHA1 e66a226e2cdbf1b47e4c79ea471c774e9dcb7a4a SHA256 4ac79025193f5da3a4becdb7db8db2fdb03df850d748b6d0c02e987fbf2c9919
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyBLsYACgkQdz7hIScOURHImACgt3uey4pfv5oiPu4aa5HqJNnB
-oUwAn0covNbkZtyZ+NHR9WEG/2bPOac8
-=7s50
------END PGP SIGNATURE-----
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
new file mode 100644
index 000000000000..bf8bfee3cce2
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
@@ -0,0 +1,74 @@
+--- src/network/playergamelistings.h.old	2010-11-08 13:49:25.000000000 +0100
++++ src/network/playergamelistings.h	2010-11-08 13:52:24.000000000 +0100
+@@ -66,21 +66,21 @@
+ 	bool hidden;
+ 	PlayerListing() : id(0), 
+ 	online(0),
+-	name(0),
+-	notnickname(0),
+-	info(0),
+-	idletime(0),
++	name(QString::null),
++	notnickname(QString::null),
++	info(QString::null),
++	idletime(QString::null),
+ 	seconds_idle(0),
+-	rank(0),
++	rank(QString::null),
+ 	rank_score(0),
+-	country(0),
++	country(QString::null),
+ 	wins(0), 
+ 	losses(0),
+ 	rated_games(0),
+ 	observing(0),
+ 	playing(0), 
+-	extInfo(0),
+-	email_address(0),
++	extInfo(QString::null),
++	email_address(QString::null),
+ 	nmatch(0),
+ 	nmatch_handicapMin(0),
+ 	specialbyte(0),
+@@ -189,7 +189,7 @@
+ 	_white_rank_score(0), 
+ 	_black_rank_score(0), 
+ 	observers(0), 
+-	result(0),
++	result(QString::null),
+ 	flags(IN_PROGRESS),
+ 	rated(0), 
+ 	owner_id(0), 
+--- src/board/board.h.old	2010-11-08 13:57:26.000000000 +0100
++++ src/board/board.h	2010-11-08 13:58:17.000000000 +0100
+@@ -50,7 +50,7 @@
+ 
+ 	void removeGhosts();
+ 	void setVarGhost(StoneColor c, int x, int y);
+-	void setMark(int x, int y, MarkType t, bool update=true, QString txt=0, bool overlay=true);
++	void setMark(int x, int y, MarkType t, bool update=true, QString txt=QString::null, bool overlay=true);
+ 	Mark* hasMark(int x, int y);
+ 	void removeMark(int x, int y, bool update = false);
+ 	void removeDeadMarks();
+--- src/board/boardwindow.h.old	2010-11-08 14:21:19.000000000 +0100
++++ src/board/boardwindow.h	2010-11-08 14:21:39.000000000 +0100
+@@ -45,7 +45,7 @@
+ 	~BoardWindow();
+ 	
+ 	void init();
+-	bool loadSGF(const QString fileName, const QString SGFLoaded=0);
++	bool loadSGF(const QString fileName, const QString SGFLoaded=QString::null);
+ 	bool doSave(QString fileName, bool force);
+ 	QString getCandidateFileName();
+ 
+--- src/sgf/sgfparser.h.old	2010-11-08 14:29:05.000000000 +0100
++++ src/sgf/sgfparser.h	2010-11-08 14:29:27.000000000 +0100
+@@ -51,7 +51,7 @@
+ */
+ protected:
+ 	int minPos(int n1, int n2, int n3);
+-	bool corruptSgf(int where=0, QString reason=NULL);
++	bool corruptSgf(int where=0, QString reason=QString::null);
+ 
+ 	bool parseProperty(const QString &toParse, const QString &prop, QString &result);
+ 
diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
index 6a8bf18f4edc..4b41970f0915 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.6 2010/09/03 17:22:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.4_p20100322.ebuild,v 1.7 2010/11/08 13:50:09 tupone Exp $
 
 EAPI=2
 inherit eutils qt4-r2 games
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="media-libs/alsa-lib
+RDEPEND="media-libs/alsa-lib
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-test:4"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i \
@@ -30,7 +31,8 @@ src_prepare() {
 		-e "/TRANSLATIONS_PATH_PREFIX/s:/usr/share:${GAMES_DATADIR}:" \
 		src/defines.h || die
 
-	epatch "${FILESDIR}"/${P}-gcc45.patch
+	epatch "${FILESDIR}"/${P}-gcc45.patch \
+		"${FILESDIR}"/${P}-qt47.patch
 }
 
 src_configure() {