Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2014-07-16 16:18:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2014-06-19 13:18:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2014-07-16 16:18:24.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:20:06 UTC 2014 - [email protected] + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- ksirk-4.13.2.tar.xz New: ---- ksirk-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.NmTBTT/_old 2014-07-16 16:18:25.000000000 +0200 +++ /var/tmp/diff_new_pack.NmTBTT/_new 2014-07-16 16:18:25.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 4.13.2 +Version: 4.13.80 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ ksirk-4.13.2.tar.xz -> ksirk-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/Dialogs/kplayersetupwidget.cpp new/ksirk-4.13.80/ksirk/Dialogs/kplayersetupwidget.cpp --- old/ksirk-4.13.2/ksirk/Dialogs/kplayersetupwidget.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/Dialogs/kplayersetupwidget.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -71,7 +71,6 @@ GameLogic::ONU* onu, unsigned int playerNumber, QString &playerName, - bool network, QString& password, bool computerPlayer, QMap< QString, QString >& nations, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/Dialogs/kplayersetupwidget.h new/ksirk-4.13.80/ksirk/Dialogs/kplayersetupwidget.h --- old/ksirk-4.13.2/ksirk/Dialogs/kplayersetupwidget.h 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/Dialogs/kplayersetupwidget.h 2014-05-11 00:08:05.000000000 +0200 @@ -59,7 +59,6 @@ GameLogic::ONU* onu, unsigned int playerNumber, QString &playerName, - bool network, QString& password, bool computerPlayer, QMap< QString, QString >& nations, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/GameLogic/aiColsonPlayer.cpp new/ksirk-4.13.80/ksirk/GameLogic/aiColsonPlayer.cpp --- old/ksirk-4.13.2/ksirk/GameLogic/aiColsonPlayer.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/GameLogic/aiColsonPlayer.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -779,8 +779,6 @@ const Continent* continent = 0; int min = 10000; - int max = 0; - int bonus = 0; contIt = m_world->getContinents().begin(); contIt_end = m_world->getContinents().end(); for (; contIt != contIt_end; contIt++) @@ -799,8 +797,6 @@ { continent = cont; min = piOppo[cont]; - max = piCount[cont]; - bonus = cont->getBonus(); } } } @@ -811,7 +807,7 @@ int AIColsonPlayer::NbEnemyAdjacent(Country* iCountry) { - std::map<Player*, int> NumEnemy; + std::map<Player*, unsigned int> NumEnemy; std::map<Player*, bool> fIsEnemy; bool fIAmStrong; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/GameLogic/gameautomaton.cpp new/ksirk-4.13.80/ksirk/GameLogic/gameautomaton.cpp --- old/ksirk-4.13.2/ksirk/GameLogic/gameautomaton.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/GameLogic/gameautomaton.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -1149,7 +1149,6 @@ unsigned int playerNum = Dice::roll(max); // kDebug() << "Choice player num " << playerNum << " on " << max << endl; PlayersArray::iterator itp = playerList()->begin(); - PlayersArray::iterator itp_end = playerList()->end(); unsigned int j = 1; for (; j < playerNum; j++,itp++) {} target = dynamic_cast< Player* >(*itp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/GameLogic/player.cpp new/ksirk-4.13.80/ksirk/GameLogic/player.cpp --- old/ksirk-4.13.2/ksirk/GameLogic/player.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/GameLogic/player.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -147,7 +147,7 @@ void Player::decrNbAvailArmies(unsigned int nb) { // kDebug() << "Player::decrNbAvailArmies " << name() << " " << nb << endl; - if (nb > m_distributionData.nbToPlace()/*m_nbAvailArmies*/) + if (nb > (unsigned)m_distributionData.nbToPlace()/*m_nbAvailArmies*/) { kError() << "Removing " << nb << " armies while owning " << m_distributionData.nbToPlace()/*m_nbAvailArmies*/ << endl; Q_ASSERT(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/Jabber/kmessagejabber.cpp new/ksirk-4.13.80/ksirk/Jabber/kmessagejabber.cpp --- old/ksirk-4.13.2/ksirk/Jabber/kmessagejabber.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/Jabber/kmessagejabber.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -87,7 +87,7 @@ void KMessageJabber::slotResourceUnavailable(const Jid& jid, const Resource& resource) { - kDebug() << jid.full(); + kDebug() << jid.full() << resource.name(); } void KMessageJabber::slotGroupChatPresence(const XMPP::Jid& jid, const XMPP::Status& status) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/kgamewin.cpp new/ksirk-4.13.80/ksirk/kgamewin.cpp --- old/ksirk-4.13.2/ksirk/kgamewin.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/kgamewin.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -651,13 +651,6 @@ } m_scene_world = new QGraphicsScene(0, 0, width, height,this); - // create the main menu - bool firstCall = false; - if (m_mainMenu == 0) - { - firstCall = true; - } - kDebug() << "create the world map view"; if (m_theWorld != 0) { @@ -1096,6 +1089,7 @@ delete m_automaton->playerList()->takeFirst(); } delete m_automaton; m_automaton = 0;*/ + KGlobal::config()->sync(); return true; } @@ -1360,7 +1354,7 @@ QString nomEntre = ""; QString password = ""; QString nationName = ""; - m_newPlayerWidget->init(m_automaton,m_theWorld,(int)1,nomEntre,false,password,false,nations,nationName, m_newGameSetup); + m_newPlayerWidget->init(m_automaton,m_theWorld,(int)1,nomEntre,password,false,nations,nationName, m_newGameSetup); m_centralWidget->setCurrentIndex(NEWPLAYER_INDEX); // Players names QString mes = ""; @@ -1419,7 +1413,7 @@ QString password; bool computer=false; - m_newPlayerWidget->init(m_automaton, m_theWorld, 1, nomEntre, true, password, computer, nations, nationName, m_newGameSetup); + m_newPlayerWidget->init(m_automaton, m_theWorld, 1, nomEntre, password, computer, nations, nationName, m_newGameSetup); m_centralWidget->setCurrentIndex(NEWPLAYER_INDEX); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/kgamewin.h new/ksirk-4.13.80/ksirk/kgamewin.h --- old/ksirk-4.13.2/ksirk/kgamewin.h 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/kgamewin.h 2014-05-11 00:08:05.000000000 +0200 @@ -689,7 +689,6 @@ * Reimplementation of the inherited function called when a window close event arise */ bool queryClose(); - bool queryExit(); /** Shows some explanations on how to start playing */ void explain(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/kgamewinslots.cpp new/ksirk-4.13.80/ksirk/kgamewinslots.cpp --- old/ksirk-4.13.2/ksirk/kgamewinslots.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/kgamewinslots.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -380,15 +380,6 @@ return; } -/** @todo Clean exit with memory freeing */ -bool KGameWindow::queryExit() -{ -// kDebug() << "Writing skin m_config: " << m_automaton->skin(); -// KGlobal::config()->group("skin").writeEntry("skin", m_automaton->skin()); - KGlobal::config()->sync(); - return true; -} - void KGameWindow::slotArena(bool isCheck) { if (isCheck) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirk/mainMenu.cpp new/ksirk-4.13.80/ksirk/mainMenu.cpp --- old/ksirk-4.13.2/ksirk/mainMenu.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirk/mainMenu.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -51,7 +51,7 @@ connect(pbQuit, SIGNAL(clicked()), game, SLOT(close())); } -void mainMenu::init(Ksirk::GameLogic::ONU* theWorld) +void mainMenu::init(Ksirk::GameLogic::ONU* /*theWorld*/) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirkskineditor/mainwindow.cpp new/ksirk-4.13.80/ksirkskineditor/mainwindow.cpp --- old/ksirk-4.13.2/ksirkskineditor/mainwindow.cpp 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirkskineditor/mainwindow.cpp 2014-05-11 00:08:05.000000000 +0200 @@ -552,6 +552,7 @@ return false; } } + KGlobal::config()->sync(); return true; } @@ -587,13 +588,6 @@ dialog.exec(); } -bool MainWindow::queryExit() -{ -// kDebug() << "Writing skin m_config: " << m_automaton->skin(); - KGlobal::config()->sync(); - return true; -} - void MainWindow::slotFlagButtonClicked() { m_infantryButton->setChecked(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.13.2/ksirkskineditor/mainwindow.h new/ksirk-4.13.80/ksirkskineditor/mainwindow.h --- old/ksirk-4.13.2/ksirkskineditor/mainwindow.h 2014-03-04 06:56:11.000000000 +0100 +++ new/ksirk-4.13.80/ksirkskineditor/mainwindow.h 2014-05-11 00:08:05.000000000 +0200 @@ -114,8 +114,6 @@ * Reimplementation of the inherited function called when a window close event arise */ bool queryClose(); - bool queryExit(); - public Q_SLOTS: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
