Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2013-03-14 14:07:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksirk", Maintainer is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2013-02-04 20:46:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2013-03-14 14:07:44.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 2 16:12:22 UTC 2013 - [email protected] + +- Update to 4.10.1 + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information + +------------------------------------------------------------------- Old: ---- ksirk-4.10.0.tar.xz New: ---- ksirk-4.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.fZSuEa/_old 2013-03-14 14:08:03.000000000 +0100 +++ /var/tmp/diff_new_pack.fZSuEa/_new 2013-03-14 14:08:03.000000000 +0100 @@ -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.10.0 +Version: 4.10.1 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ ksirk-4.10.0.tar.xz -> ksirk-4.10.1.tar.xz ++++++ Files old/ksirk-4.10.0/doc/index.cache.bz2 and new/ksirk-4.10.1/doc/index.cache.bz2 differ Files old/ksirk-4.10.0/doc/ksirkskineditor/index.cache.bz2 and new/ksirk-4.10.1/doc/ksirkskineditor/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.0/ksirk/Dialogs/newGameDialogImpl.cpp new/ksirk-4.10.1/ksirk/Dialogs/newGameDialogImpl.cpp --- old/ksirk-4.10.0/ksirk/Dialogs/newGameDialogImpl.cpp 2013-01-23 23:07:16.000000000 +0100 +++ new/ksirk-4.10.1/ksirk/Dialogs/newGameDialogImpl.cpp 2013-03-01 08:16:50.000000000 +0100 @@ -183,10 +183,12 @@ void NewGameWidget::slotGHNS() { - if ( KConfigDialog::showDialog("settings") ) - { - return; - } + // Bug 281294. No need to touch ConfigDialog. + // Skins are handled by KNS3 dialog. + // if ( KConfigDialog::showDialog("settings") ) + // { + // return; + // } kDebug(); KNS3::DownloadDialog dialog(this); dialog.exec(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.0/ksirk/decoratedgameframe.cpp new/ksirk-4.10.1/ksirk/decoratedgameframe.cpp --- old/ksirk-4.10.0/ksirk/decoratedgameframe.cpp 2013-01-23 23:07:16.000000000 +0100 +++ new/ksirk-4.10.1/ksirk/decoratedgameframe.cpp 2013-03-01 08:16:50.000000000 +0100 @@ -212,7 +212,8 @@ // we cannot see detail of country during the AI or virtual player game // as the right widget is reserved for combat - if(m_automaton->game()->theWorld()->countryAt(detailPoint)!=0) + // Bug 309863. Disable country details during auto attack also. + if(m_automaton->game()->theWorld()->countryAt(detailPoint)!=0 && !m_automaton->isAttackAuto()) { detailsAction->setVisible(true); } @@ -227,6 +228,13 @@ // we disabled the nextPlayer action and the goal nextPlayer->setVisible(false); goalAction->setVisible(false); + // Bug 309863. Details of the country and combat are both shown in the right widget. + // Some of the resources are used by both which leads to the crash. Disable detaied view + // of the country when AI is playing. Some of the previous attempts to resolve this (or similar) issue(s) + // disabled this item from context menu, but didn't cover all possible paths. Here, just follow that idea. + // It makes no sense to show just for a moment details of the country when AI combat details will override + // and reuse right widget (no time for human to inspect country details in such short time). + detailsAction->setVisible(false); } menu->exec(menuPoint); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.0/ksirk/krightdialog.cpp new/ksirk-4.10.1/ksirk/krightdialog.cpp --- old/ksirk-4.10.0/ksirk/krightdialog.cpp 2013-01-23 23:07:17.000000000 +0100 +++ new/ksirk-4.10.1/ksirk/krightdialog.cpp 2013-03-01 08:16:50.000000000 +0100 @@ -417,11 +417,21 @@ { kDebug(); - QMovie* movie = loadingLabel->movie(); - delete movie; - - loadingLabel->clear(); - infoProcess->clear(); + // Bug 309863. Should not happen anymore because Country details and Fight results shouldn't be mixed. + // If, by any chance, occurs again, do not crash and log the incident. In that case label just won't be refreshed. + if (loadingLabel != 0) + { + QMovie* movie = loadingLabel->movie(); + delete movie; + loadingLabel->clear(); + } + else + kDebug() << "Item (loadingLabel) has already been cleared!"; + + if (infoProcess != 0) + infoProcess->clear(); + else + kDebug() << "Item (infoProcess) has already been cleared!"; milieu = new QWidget(this); milieu->setAutoFillBackground(true); @@ -585,7 +595,9 @@ loadingLabel->clear(); delete movie; delete loadingLabel; + loadingLabel = 0; delete infoProcess; + infoProcess = 0; delete milieu2; milieu2 = 0; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
