Hello community, here is the log from the commit of package granatier for openSUSE:Factory checked in at 2018-05-16 18:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/granatier (Old) and /work/SRC/openSUSE:Factory/.granatier.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "granatier" Wed May 16 18:36:03 2018 rev:73 rq:607112 version:18.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/granatier/granatier.changes 2018-04-27 16:01:53.886632972 +0200 +++ /work/SRC/openSUSE:Factory/.granatier.new/granatier.changes 2018-05-16 18:36:10.831033115 +0200 @@ -1,0 +2,10 @@ +Fri May 11 05:17:43 UTC 2018 - [email protected] + +- Update to 18.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.1.php +- Changes since 18.04.0: + * backport fix to make random arena mode work again + +------------------------------------------------------------------- Old: ---- granatier-18.04.0.tar.xz New: ---- granatier-18.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ granatier.spec ++++++ --- /var/tmp/diff_new_pack.Rpiitb/_old 2018-05-16 18:36:11.850996002 +0200 +++ /var/tmp/diff_new_pack.Rpiitb/_new 2018-05-16 18:36:11.854995857 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: granatier -Version: 18.04.0 +Version: 18.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ granatier-18.04.0.tar.xz -> granatier-18.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-18.04.0/po/fr/granatier.po new/granatier-18.04.1/po/fr/granatier.po --- old/granatier-18.04.0/po/fr/granatier.po 2018-04-13 02:08:32.000000000 +0200 +++ new/granatier-18.04.1/po/fr/granatier.po 2018-05-08 02:14:25.000000000 +0200 @@ -3,6 +3,7 @@ # Guillaume Pujol <[email protected]>, 2009. # xavier <[email protected]>, 2012, 2013. # Sebastien Renard <[email protected]>, 2015. +# Simon Depiets <[email protected]>, 2018. # msgid "" msgstr "" @@ -17,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-18.04.0/po/zh_CN/granatier.po new/granatier-18.04.1/po/zh_CN/granatier.po --- old/granatier-18.04.0/po/zh_CN/granatier.po 2018-04-13 02:08:33.000000000 +0200 +++ new/granatier-18.04.1/po/zh_CN/granatier.po 2018-05-08 02:14:25.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:14+0100\n" -"PO-Revision-Date: 2018-04-05 09:40-0400\n" +"PO-Revision-Date: 2018-04-26 06:09-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/granatier-18.04.0/src/game.cpp new/granatier-18.04.1/src/game.cpp --- old/granatier-18.04.0/src/game.cpp 2018-03-13 05:18:35.000000000 +0100 +++ new/granatier-18.04.1/src/game.cpp 2018-04-29 14:12:07.000000000 +0200 @@ -96,28 +96,24 @@ { if(m_randomArenaModeArenaList.isEmpty()) { - m_randomArenaModeArenaList = Settings::self()->randomArenaModeArenaList(); + auto randomArenaModeArenaList = Settings::self()->randomArenaModeArenaList(); QStringList arenasAvailable; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("arenas"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { - const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString& file, fileNames) { + for(const auto& dir: dirs) { + const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); + for(const auto& file: fileNames) { arenasAvailable.append(dir + QLatin1Char('/') + file); } } - - QStringList::Iterator i = m_randomArenaModeArenaList.begin(); - while(i != m_randomArenaModeArenaList.end()) - { - if(arenasAvailable.contains(*i)) - { - i++; - } - else - { - i = m_randomArenaModeArenaList.erase(i); + // store the random arenas if they are available + for(const auto& randomArena: randomArenaModeArenaList) { + for(const auto& arena: arenasAvailable) { + if(arena.endsWith(randomArena)) { + m_randomArenaModeArenaList.append(arena); + break; + } } }
