Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-ki18n for openSUSE:Factory checked in at 2025-04-15 16:43:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-ki18n (Old) and /work/SRC/openSUSE:Factory/.kf6-ki18n.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-ki18n" Tue Apr 15 16:43:29 2025 rev:15 rq:1268850 version:6.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-ki18n/kf6-ki18n.changes 2025-03-17 22:16:28.611681771 +0100 +++ /work/SRC/openSUSE:Factory/.kf6-ki18n.new.1907/kf6-ki18n.changes 2025-04-15 16:46:07.783666146 +0200 @@ -1,0 +2,12 @@ +Sat Apr 5 12:33:13 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.13.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.13.0 +- Changes since 6.12.0: + * Use iso-codes' common_name field for country names when present (kde#501968) + * It compiles fine without qt6.9 deprecated methods + * Update dependency version to 6.13.0 + +------------------------------------------------------------------- Old: ---- ki18n-6.12.0.tar.xz ki18n-6.12.0.tar.xz.sig New: ---- ki18n-6.13.0.tar.xz ki18n-6.13.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-ki18n.spec ++++++ --- /var/tmp/diff_new_pack.4hUkU0/_old 2025-04-15 16:46:09.007717400 +0200 +++ /var/tmp/diff_new_pack.4hUkU0/_new 2025-04-15 16:46:09.023718070 +0200 @@ -1,7 +1,7 @@ # # spec file for package kf6-ki18n # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %define qt6_version 6.7.0 %define rname ki18n -# Full KF6 version (e.g. 6.9.0) +# Full KF6 version (e.g. 6.13.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-ki18n -Version: 6.12.0 +Version: 6.13.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-6.12.0.tar.xz -> ki18n-6.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.12.0/CMakeLists.txt new/ki18n-6.13.0/CMakeLists.txt --- old/ki18n-6.12.0/CMakeLists.txt 2025-03-07 15:25:45.000000000 +0100 +++ new/ki18n-6.13.0/CMakeLists.txt 2025-04-04 16:00:45.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.12.0") # handled by release scripts +set(KF_VERSION "6.13.0") # handled by release scripts project(KI18n VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.12.0 NO_MODULE) +find_package(ECM 6.13.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -86,7 +86,7 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") ecm_set_disabled_deprecation_versions( - QT 6.8.0 + QT 6.9.0 ) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.12.0/autotests/kcountrytest.cpp new/ki18n-6.13.0/autotests/kcountrytest.cpp --- old/ki18n-6.12.0/autotests/kcountrytest.cpp 2025-03-07 15:25:45.000000000 +0100 +++ new/ki18n-6.13.0/autotests/kcountrytest.cpp 2025-04-04 16:00:45.000000000 +0200 @@ -212,6 +212,8 @@ // Ambigous substrings of multiple countries QCOMPARE(KCountry::fromName(u"Korea").alpha2(), QString()); + // common_name matching + QCOMPARE(KCountry::fromName(u"South Korea").alpha2(), "KR"_L1); // input that shouldn't match anything QCOMPARE(KCountry::fromName(u"A").alpha2(), QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.12.0/src/localedata/isocodescache.cpp new/ki18n-6.13.0/src/localedata/isocodescache.cpp --- old/ki18n-6.12.0/src/localedata/isocodescache.cpp 2025-03-07 15:25:45.000000000 +0100 +++ new/ki18n-6.13.0/src/localedata/isocodescache.cpp 2025-04-04 16:00:45.000000000 +0200 @@ -18,9 +18,11 @@ #include <QJsonObject> #include <QStandardPaths> +using namespace Qt::Literals; + // increment those when changing the format enum : uint32_t { - Iso3166_1CacheHeader = 0x4B493101, + Iso3166_1CacheHeader = 0x4B493102, Iso3166_2CacheHeader = 0x4B493201, }; @@ -144,6 +146,14 @@ return nullptr; } +[[nodiscard]] static QByteArray nameForIso3166_1(const QJsonObject &entry) +{ + if (const auto commonName = entry.value("common_name"_L1).toString(); !commonName.isEmpty()) { + return commonName.toUtf8(); + } + return entry.value("name"_L1).toString().toUtf8(); +} + void IsoCodesCache::createIso3166_1Cache(const QString &isoCodesPath, const QString &cacheFilePath) { qCDebug(KI18NLD) << "Rebuilding ISO 3166-1 cache"; @@ -170,7 +180,7 @@ assert(std::numeric_limits<uint16_t>::max() > iso3166_1stringTable.size()); alpha2NameMap.push_back({alpha2Key, (uint16_t)iso3166_1stringTable.size()}); - iso3166_1stringTable.append(entry.value(QLatin1String("name")).toString().toUtf8()); + iso3166_1stringTable.append(nameForIso3166_1(entry)); iso3166_1stringTable.append('\0'); const auto alpha3Key = IsoCodes::alpha3CodeToKey(entry.value(QLatin1String("alpha_3")).toString());
