Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package konquest for openSUSE:Factory checked in at 2022-11-04 17:36:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konquest (Old) and /work/SRC/openSUSE:Factory/.konquest.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konquest" Fri Nov 4 17:36:28 2022 rev:126 rq:1033321 version:22.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/konquest/konquest.changes 2022-10-15 16:39:00.406376807 +0200 +++ /work/SRC/openSUSE:Factory/.konquest.new.2275/konquest.changes 2022-11-04 17:39:54.414359462 +0100 @@ -1,0 +2,8 @@ +Tue Nov 1 11:20:57 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.08.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.08.3/ + +------------------------------------------------------------------- Old: ---- konquest-22.08.2.tar.xz konquest-22.08.2.tar.xz.sig New: ---- konquest-22.08.3.tar.xz konquest-22.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konquest.spec ++++++ --- /var/tmp/diff_new_pack.4R86U6/_old 2022-11-04 17:39:54.942362221 +0100 +++ /var/tmp/diff_new_pack.4R86U6/_new 2022-11-04 17:39:54.950362262 +0100 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: konquest -Version: 22.08.2 +Version: 22.08.3 Release: 0 Summary: Galactic strategy game License: GPL-2.0-or-later ++++++ konquest-22.08.2.tar.xz -> konquest-22.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/CMakeLists.txt new/konquest-22.08.3/CMakeLists.txt --- old/konquest-22.08.2/CMakeLists.txt 2022-10-10 22:16:20.000000000 +0200 +++ new/konquest-22.08.3/CMakeLists.txt 2022-10-30 22:15:18.000000000 +0100 @@ -3,7 +3,7 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "2") +set (RELEASE_SERVICE_VERSION_MICRO "3") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump KONQUEST_BASE_VERSION once new features are added diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/po/zh_CN/konquest.po new/konquest-22.08.3/po/zh_CN/konquest.po --- old/konquest-22.08.2/po/zh_CN/konquest.po 2022-10-11 06:55:31.000000000 +0200 +++ new/konquest-22.08.3/po/zh_CN/konquest.po 2022-11-01 01:09:14.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-01 02:05+0000\n" -"PO-Revision-Date: 2022-10-02 15:52\n" +"PO-Revision-Date: 2022-10-30 07:51\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/src/map/map.cc new/konquest-22.08.3/src/map/map.cc --- old/konquest-22.08.2/src/map/map.cc 2022-10-10 22:16:20.000000000 +0200 +++ new/konquest-22.08.3/src/map/map.cc 2022-10-30 22:15:18.000000000 +0100 @@ -130,18 +130,40 @@ } +// Create an unique name in the A-Z range +// once we reach Z, go do the same but with 2 chars, etc. QString -Map::UniquePlanetName(void) +Map::UniquePlanetName() const { - char c = 'A'; + QString newName = QStringLiteral("A"); again: for (Planet *planet : planets()) { - if (planet->name().at(0).toLatin1() == c) { - c++; + if (planet->name() == newName) { + if (newName.back() == QLatin1Char('Z')) { + bool addNewA = true; + for (int i = newName.length() - 1; i >= 0; --i) { + if (newName[i] != QLatin1Char('Z')) { + newName[i] = newName[i].unicode() + 1; + for (int j = i + 1; j < newName.length(); ++j) { + newName[j] = QLatin1Char('A'); + } + addNewA = false; + break; + } + } + if (addNewA) { + for (int i = 0; i < newName.length(); ++i) { + newName[i] = QLatin1Char('A'); + } + newName += QStringLiteral("A"); + } + } else { + newName.back() = newName.back().unicode() + 1; + } goto again; } } - return QChar::fromLatin1(c); + return newName; } @@ -206,10 +228,10 @@ const QList <Planet*> -Map::planets() +Map::planets() const { QList <Planet*>planets; - for (const QList<Sector> &i : std::as_const(m_grid)) { + for (const QList<Sector> &i : m_grid) { for (const Sector &j : i) { if (j.hasPlanet()) { planets += j.planet(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/src/map/map.h new/konquest-22.08.3/src/map/map.h --- old/konquest-22.08.2/src/map/map.h 2022-10-10 22:16:20.000000000 +0200 +++ new/konquest-22.08.3/src/map/map.h 2022-10-30 22:15:18.000000000 +0100 @@ -55,7 +55,7 @@ return nullptr; } - const QList<Planet*> planets(); + const QList<Planet*> planets() const; protected: void childSectorUpdate(); @@ -65,7 +65,7 @@ private: Sector* findRandomFreeSector(); - QString UniquePlanetName(void); + QString UniquePlanetName() const; protected: // A map is a 2-D array of Sectors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/src/org.kde.konquest.appdata.xml new/konquest-22.08.3/src/org.kde.konquest.appdata.xml --- old/konquest-22.08.2/src/org.kde.konquest.appdata.xml 2022-10-10 22:16:20.000000000 +0200 +++ new/konquest-22.08.3/src/org.kde.konquest.appdata.xml 2022-10-30 22:15:18.000000000 +0100 @@ -18,6 +18,7 @@ <name xml:lang="gl">Konquest</name> <name xml:lang="id">Konquest</name> <name xml:lang="it">Konquest</name> + <name xml:lang="ka">Konquest</name> <name xml:lang="ko">Konquest</name> <name xml:lang="nl">Konquest</name> <name xml:lang="nn">Konquest</name> @@ -53,6 +54,7 @@ <summary xml:lang="gl">Xogo de estratexia gal??ctica</summary> <summary xml:lang="id">Permainan Strategi Galaksi</summary> <summary xml:lang="it">Gioco galattico di strategia</summary> + <summary xml:lang="ka">????????????????????????????????? ????????????????????????????????? ??????????????????</summary> <summary xml:lang="ko">?????? ?????? ??????</summary> <summary xml:lang="nl">Strategisch ruimtespel</summary> <summary xml:lang="nn">Galaktisk strategispel</summary> @@ -128,9 +130,9 @@ <binary>konquest</binary> </provides> <releases> + <release version="2.4.22083" date="2022-11-03"/> <release version="2.4.22082" date="2022-10-13"/> <release version="2.4.22081" date="2022-09-08"/> <release version="2.4.22080" date="2022-08-18"/> - <release version="2.4.22043" date="2022-07-07"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-22.08.2/src/org.kde.konquest.desktop new/konquest-22.08.3/src/org.kde.konquest.desktop --- old/konquest-22.08.2/src/org.kde.konquest.desktop 2022-10-10 22:16:20.000000000 +0200 +++ new/konquest-22.08.3/src/org.kde.konquest.desktop 2022-10-30 22:15:18.000000000 +0100 @@ -29,6 +29,7 @@ Name[is]=Geimstyrj??ld Name[it]=Konquest Name[ja]=Konquest +Name[ka]=Konquest Name[kk]=Konquest Name[km]=Konquest Name[ko]=Konquest @@ -96,6 +97,7 @@ GenericName[is]=Herk??nskuleikur GenericName[it]=Gioco di strategia galattica GenericName[ja]=????????????????????? +GenericName[ka]=????????????????????????????????? ????????????????????????????????? ?????????????????? GenericName[kk]=???????????????????????? ?????????????????? ???????? GenericName[km]=???????????????????????????????????????????????????????????????????????? GenericName[ko]=?????? ?????? ??????
