diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2010-06-01 08:13:45 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2010-06-01 08:13:45 +0000 |
commit | 5616432006de0d62c1e399603ae3b537385775f1 (patch) | |
tree | c75db97bbbbc561f930fe8aa3575de62204d34a7 /games-board | |
parent | x86 stable wrt bug #320931 (diff) | |
download | gentoo-2-5616432006de0d62c1e399603ae3b537385775f1.tar.gz gentoo-2-5616432006de0d62c1e399603ae3b537385775f1.tar.bz2 gentoo-2-5616432006de0d62c1e399603ae3b537385775f1.zip |
Fix build with gcc-4.5 Bug #322263
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-board')
-rw-r--r-- | games-board/qgo/ChangeLog | 6 | ||||
-rw-r--r-- | games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch | 77 | ||||
-rw-r--r-- | games-board/qgo/qgo-1.5.4_p20100322.ebuild | 4 |
3 files changed, 85 insertions, 2 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/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() { |