From 5442e9b8f357932ed5d6cb46e90fcbf6f453469f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Oct 2011 23:14:37 +0000 Subject: Thu Oct 6 23:14:37 UTC 2011 --- community/qgo/PKGBUILD | 29 ++++--- community/qgo/gcc43.patch | 37 +++++++++ community/qgo/gcc45.patch | 205 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 261 insertions(+), 10 deletions(-) create mode 100644 community/qgo/gcc43.patch create mode 100644 community/qgo/gcc45.patch (limited to 'community/qgo') diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD index d9589aef6..595c07c70 100644 --- a/community/qgo/PKGBUILD +++ b/community/qgo/PKGBUILD @@ -1,25 +1,34 @@ -# Maintainer: Douglas Soares de Andrade +# $Id: PKGBUILD 56296 2011-10-05 06:31:10Z andrea $ +# Maintainer: +# Contributor: Douglas Soares de Andrade pkgname=qgo pkgver=1.5.4 -_realver=1.5.4-r2 -pkgrel=3 -pkgdesc="qGo is a Go client and full featured SGF editor." +_realver=1.5.4-r3 +pkgrel=4 +pkgdesc="A Go client and full featured SGF editor" arch=('i686' 'x86_64') url="http://qgo.sourceforge.net/" license=('GPL') depends=('qt3' 'libsm') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${_realver}.tar.gz - qgo-gcc43-iostream.patch) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-${_realver}.tar.gz" + 'gcc43.patch' + 'gcc45.patch') +md5sums=('f8f9a6288b7854932bb2666a58631988' + '1e242ff9c3b46bcebfda0d7ae3aef2fa' + '58de47198a50dedb029acbe28bd3bb1b') build() { . /etc/profile.d/qt3.sh cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/qgo-gcc43-iostream.patch || return 1 + patch -Np1 -i "${srcdir}"/gcc43.patch + patch -Np1 -i "${srcdir}"/gcc45.patch ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('5b83bd5ec234beabe48ca17eace3957e' - '148c470f6426e6d626b3105807b0c006') diff --git a/community/qgo/gcc43.patch b/community/qgo/gcc43.patch new file mode 100644 index 000000000..1af8b8bd9 --- /dev/null +++ b/community/qgo/gcc43.patch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_g++-4.3.dpatch by Pierre Habouzit +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: g++-4.3 patch + +@DPATCH@ +--- qgo-1.5.4-r2~/src/matrix.cpp 2004-10-30 20:49:50.000000000 +0000 ++++ qgo-1.5.4-r2/src/matrix.cpp 2008-03-16 23:04:18.306414183 +0000 +@@ -2,12 +2,14 @@ + * matrix.cpp + */ + ++#include + #include "matrix.h" +-#include + #ifndef NO_DEBUG +-#include ++#include + #endif + ++using namespace std; ++ + Matrix::Matrix(int s) + : size(s) + { +--- qgo-1.5.4-r2~/src/tree.cpp 2005-05-12 20:58:23.000000000 +0000 ++++ qgo-1.5.4-r2/src/tree.cpp 2008-03-16 23:04:50.660267034 +0000 +@@ -5,7 +5,7 @@ + #include "tree.h" + #include "move.h" + #include "qgo.h" +-#include ++#include + #include + + Tree::Tree(int board_size) diff --git a/community/qgo/gcc45.patch b/community/qgo/gcc45.patch new file mode 100644 index 000000000..6c71f92f6 --- /dev/null +++ b/community/qgo/gcc45.patch @@ -0,0 +1,205 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: fix builiding with gcc4.5 +## Origin/Author: Ubuntu +## Bug: http://bugs.launchpad.net/bugs/756004 +## 06_ftbfs_gcc45.dpatch by Andreas Moog +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix build with gcc 4.5 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/gamedialog.cpp qgo-1.5.4-r3/src/gamedialog.cpp +--- qgo-1.5.4-r3~/src/gamedialog.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/gamedialog.cpp 2011-04-12 20:03:15.640382627 +0200 +@@ -512,7 +512,7 @@ + if (handicapSpin->value() != val.toInt()) + { + handicapSpin->setValue(val.toInt()); +- handicapSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ handicapSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + handicapSpin->unsetPalette(); +@@ -521,7 +521,7 @@ + if (boardSizeSpin->value() != val.toInt()) + { + boardSizeSpin->setValue(val.toInt()); +- boardSizeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ boardSizeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + boardSizeSpin->unsetPalette(); +@@ -530,7 +530,7 @@ + if (timeSpin->value() != val.toInt()/60) + { + timeSpin->setValue(val.toInt()/60); +- timeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ timeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + timeSpin->unsetPalette(); +@@ -539,7 +539,7 @@ + if (byoTimeSpin->value() != val.toInt()/60) + { + byoTimeSpin->setValue(val.toInt()/60); +- byoTimeSpin->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ byoTimeSpin->setPaletteBackgroundColor(QColor("cyan")); + } + else + byoTimeSpin->unsetPalette(); +@@ -550,25 +550,25 @@ + val = element(line,0," "); + if ( !(play_nigiri_button->isChecked()) && (val == "N")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_nigiri_button->setChecked(true); + + } + else if ( (play_black_button->isChecked()) && (val == "B")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_white_button->setChecked(true); + + } + else if ( (play_white_button->isChecked()) && (val == "W")) + { +- play_nigiri_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_white_button->setPaletteBackgroundColor(QColor::QColor("cyan")); +- play_black_button->setPaletteBackgroundColor(QColor::QColor("cyan")); ++ play_nigiri_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_white_button->setPaletteBackgroundColor(QColor("cyan")); ++ play_black_button->setPaletteBackgroundColor(QColor("cyan")); + play_black_button->setChecked(true); + + } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/mainwin.cpp qgo-1.5.4-r3/src/mainwin.cpp +--- qgo-1.5.4-r3~/src/mainwin.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/mainwin.cpp 2011-04-12 20:03:15.640382627 +0200 +@@ -68,35 +68,35 @@ + { + + +- prefsIcon= QPixmap::QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS); ++ prefsIcon= QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS); + // infoIcon= QPixmap(ICON_GAMEINFO); +- exitIcon = QPixmap::QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT); +- fileNewboardIcon = QPixmap::QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD); +- fileNewIcon = QPixmap::QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW); +- fileOpenIcon = QPixmap::QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN); ++ exitIcon = QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT); ++ fileNewboardIcon = QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD); ++ fileNewIcon = QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW); ++ fileOpenIcon = QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN); + // fileSaveIcon = QPixmap(ICON_FILESAVE); + // fileSaveAsIcon = QPixmap(ICON_FILESAVEAS); + // transformIcon = QPixmap(ICON_TRANSFORM); + // charIcon = QPixmap(ICON_CHARSET); +- manualIcon = QPixmap::QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL); ++ manualIcon = QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL); + // autoplayIcon = QPixmap(ICON_AUTOPLAY); +- connectedIcon = QPixmap::QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED); +- disconnectedIcon = QPixmap::QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED); +- OpenIcon = QPixmap::QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN); +- LookingIcon = QPixmap::QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING); +- QuietIcon= QPixmap::QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET); +- NotOpenIcon = QPixmap::QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN); +- NotLookingIcon = QPixmap::QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING); +- NotQuietIcon= QPixmap::QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET); +- RefreshPlayersIcon = QPixmap::QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS); +- RefreshGamesIcon = QPixmap::QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES); +- ComputerPlayIcon = QPixmap::QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY); +- qgoIcon = QPixmap::QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY); +- NotSeekingIcon = QPixmap::QPixmap(qembed_findImage("not_seeking")); +- seekingIcon[0] = QPixmap::QPixmap(qembed_findImage("seeking1")); +- seekingIcon[1] = QPixmap::QPixmap(qembed_findImage("seeking2")); +- seekingIcon[2] = QPixmap::QPixmap(qembed_findImage("seeking3")); +- seekingIcon[3] = QPixmap::QPixmap(qembed_findImage("seeking4")); ++ connectedIcon = QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED); ++ disconnectedIcon = QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED); ++ OpenIcon = QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN); ++ LookingIcon = QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING); ++ QuietIcon= QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET); ++ NotOpenIcon = QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN); ++ NotLookingIcon = QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING); ++ NotQuietIcon= QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET); ++ RefreshPlayersIcon = QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS); ++ RefreshGamesIcon = QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES); ++ ComputerPlayIcon = QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY); ++ qgoIcon = QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY); ++ NotSeekingIcon = QPixmap(qembed_findImage("not_seeking")); ++ seekingIcon[0] = QPixmap(qembed_findImage("seeking1")); ++ seekingIcon[1] = QPixmap(qembed_findImage("seeking2")); ++ seekingIcon[2] = QPixmap(qembed_findImage("seeking3")); ++ seekingIcon[3] = QPixmap(qembed_findImage("seeking4")); + + // init + +@@ -576,7 +576,7 @@ + if (e->timerId() == seekButtonTimer) + { + imagecounter = (imagecounter+1) % 4; +- toolSeek->setIconSet(QIconSet::QIconSet(seekingIcon[imagecounter])); ++ toolSeek->setIconSet(QIconSet(seekingIcon[imagecounter])); + return; + } + +@@ -2950,17 +2950,17 @@ + //tb->setProperty( "geometry", QRect(0, 0, 20, 20)); + + //added the icons +- refreshPlayers->setIconSet(QIconSet::QIconSet(RefreshPlayersIcon)); +- refreshGames->setIconSet(QIconSet::QIconSet(RefreshGamesIcon)); +- fileNew->setIconSet(QIconSet::QIconSet(fileNewIcon)); +- fileNewBoard->setIconSet(QIconSet::QIconSet(fileNewboardIcon)); +- fileOpen->setIconSet(QIconSet::QIconSet(fileOpenIcon)); +- fileQuit->setIconSet(QIconSet::QIconSet(exitIcon)); +- computerPlay->setIconSet(QIconSet::QIconSet(ComputerPlayIcon)); +- Connect->setIconSet(QIconSet::QIconSet(connectedIcon)); +- Disconnect->setIconSet(QIconSet::QIconSet(disconnectedIcon)); +- helpManual->setIconSet(QIconSet::QIconSet(manualIcon)); +- setPreferences->setIconSet(QIconSet::QIconSet(prefsIcon)); ++ refreshPlayers->setIconSet(QIconSet(RefreshPlayersIcon)); ++ refreshGames->setIconSet(QIconSet(RefreshGamesIcon)); ++ fileNew->setIconSet(QIconSet(fileNewIcon)); ++ fileNewBoard->setIconSet(QIconSet(fileNewboardIcon)); ++ fileOpen->setIconSet(QIconSet(fileOpenIcon)); ++ fileQuit->setIconSet(QIconSet(exitIcon)); ++ computerPlay->setIconSet(QIconSet(ComputerPlayIcon)); ++ Connect->setIconSet(QIconSet(connectedIcon)); ++ Disconnect->setIconSet(QIconSet(disconnectedIcon)); ++ helpManual->setIconSet(QIconSet(manualIcon)); ++ setPreferences->setIconSet(QIconSet(prefsIcon)); + setIcon(qgoIcon); + + UserToolbar->show(); +@@ -3218,7 +3218,7 @@ + toolSeek->setOn(false); + toolSeek->setPopup(seekMenu); + toolSeek->setPopupDelay(1); +- toolSeek->setIconSet(QIconSet::QIconSet(NotSeekingIcon)); ++ toolSeek->setIconSet(QIconSet(NotSeekingIcon)); + killTimer(seekButtonTimer); + seekButtonTimer = 0; + } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qgo-1.5.4-r3~/src/qgtp.cpp qgo-1.5.4-r3/src/qgtp.cpp +--- qgo-1.5.4-r3~/src/qgtp.cpp 2011-04-12 20:03:12.000000000 +0200 ++++ qgo-1.5.4-r3/src/qgtp.cpp 2011-04-12 20:03:22.360029899 +0200 +@@ -277,7 +277,7 @@ + _cpt++; + + qDebug(QString("flush -> %1").arg(s)); +- programProcess->writeToStdin(QString::QString(s)); ++ programProcess->writeToStdin(QString(s)); + + + } -- cgit v1.2.3-54-g00ecf