Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2022-05-16 18:06:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon May 16 18:06:41 2022 rev:106 rq:977155 version:5.94.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2022-04-11 23:48:07.595836382 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new.1538/kconfig.changes 2022-05-16 18:08:17.445261205 +0200 @@ -1,0 +2,13 @@ +Tue May 10 08:17:48 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.94.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.94.0 +- Changes since 5.93.0: + * KConfigGroup: fix writePathEntry/readPathEntry roundtrip for symlinks + * autotests: skip KStandardShortcutWatcherTest on Windows + * Support storing QUuid + * Add windows CI + +------------------------------------------------------------------- Old: ---- kconfig-5.93.0.tar.xz kconfig-5.93.0.tar.xz.sig New: ---- kconfig-5.94.0.tar.xz kconfig-5.94.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.MjZZ70/_old 2022-05-16 18:08:18.025261754 +0200 +++ /var/tmp/diff_new_pack.MjZZ70/_new 2022-05-16 18:08:18.029261757 +0200 @@ -17,14 +17,14 @@ %define sonum 5 -%define _tar_path 5.93 +%define _tar_path 5.94 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kconfig -Version: 5.93.0 +Version: 5.94.0 Release: 0 Summary: Advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ kconfig-5.93.0.tar.xz -> kconfig-5.94.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/.gitlab-ci.yml new/kconfig-5.94.0/.gitlab-ci.yml --- old/kconfig-5.93.0/.gitlab-ci.yml 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/.gitlab-ci.yml 2022-05-07 23:17:52.000000000 +0200 @@ -7,3 +7,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/CMakeLists.txt new/kconfig-5.94.0/CMakeLists.txt --- old/kconfig-5.93.0/CMakeLists.txt 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/CMakeLists.txt 2022-05-07 23:17:52.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.94.0") # handled by release scripts project(KConfig VERSION ${KF_VERSION}) include(FeatureSummary) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/autotests/kconfigtest.cpp new/kconfig-5.94.0/autotests/kconfigtest.cpp --- old/kconfig-5.93.0/autotests/kconfigtest.cpp 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/autotests/kconfigtest.cpp 2022-05-07 23:17:52.000000000 +0200 @@ -83,6 +83,7 @@ static const QString s_homepath{homePath() + QLatin1String{"/foo"}}; static const QString s_homepath_escape{homePath() + QLatin1String("/foo/$HOME")}; +static const QString s_canonical_homepath{QFileInfo(homePath()).canonicalFilePath() + QLatin1String("/foo")}; static const QString s_dollargroup{QStringLiteral("$i")}; static const QString s_test_subdir{QStringLiteral("kconfigtest_subdir/")}; static const QString s_kconfig_test_subdir(s_test_subdir + QLatin1String("kconfigtest")); @@ -189,6 +190,7 @@ cg = KConfigGroup(&sc, "Path Type"); cg.writePathEntry("homepath", s_homepath); cg.writePathEntry("homepathescape", s_homepath_escape); + cg.writePathEntry("canonicalHomePath", s_canonical_homepath); cg = KConfigGroup(&sc, "Enum Types"); #if defined(_MSC_VER) && _MSC_VER == 1600 @@ -507,6 +509,7 @@ KConfigGroup sc3(&sc2, "Path Type"); QCOMPARE(sc3.readPathEntry(QStringLiteral("homepath"), QString{}), s_homepath); QCOMPARE(sc3.readPathEntry(QStringLiteral("homepathescape"), QString{}), s_homepath_escape); + QCOMPARE(sc3.readPathEntry(QStringLiteral("canonicalHomePath"), QString{}), s_canonical_homepath); QCOMPARE(sc3.entryMap().value(QStringLiteral("homepath")), s_homepath); qputenv("WITHSLASH", "/a/"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/autotests/kstandardshortcutwatchertest.cpp new/kconfig-5.94.0/autotests/kstandardshortcutwatchertest.cpp --- old/kconfig-5.93.0/autotests/kstandardshortcutwatchertest.cpp 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/autotests/kstandardshortcutwatchertest.cpp 2022-05-07 23:17:52.000000000 +0200 @@ -44,6 +44,9 @@ void KStandardShortcutWatcherTest::testSignal() { +#ifdef Q_OS_WIN + QSKIP("KConfig is built without DBus on Windows"); +#endif QSignalSpy signalSpy(KStandardShortcut::shortcutWatcher(), &KStandardShortcut::StandardShortcutWatcher::shortcutChanged); KStandardShortcut::saveShortcut(KStandardShortcut::Open, newShortcut); QTRY_COMPARE(signalSpy.count(), 1); @@ -54,6 +57,9 @@ void KStandardShortcutWatcherTest::testDataUpdated() { +#ifdef Q_OS_WIN + QSKIP("KConfig is built without DBus on Windows"); +#endif QSignalSpy signalSpy(KStandardShortcut::shortcutWatcher(), &KStandardShortcut::StandardShortcutWatcher::shortcutChanged); // Writing manually to forego automatic update in saveShortcut() KConfigGroup group(KSharedConfig::openConfig(), "Shortcuts"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/po/ca@valencia/kconfig5_qt.po new/kconfig-5.94.0/po/ca@valencia/kconfig5_qt.po --- old/kconfig-5.93.0/po/ca@valencia/kconfig5_qt.po 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/po/ca@valencia/kconfig5_qt.po 2022-05-07 23:17:52.000000000 +0200 @@ -27,7 +27,7 @@ #: core/kconfig.cpp:965 msgctxt "KConfig|" msgid "Please contact your system administrator." -msgstr "Per favor, contacteu amb l'administrador del sistema." +msgstr "Contacteu amb l'administrador del sistema." #: core/kconfigini.cpp:562 #, qt-format @@ -294,7 +294,7 @@ #: gui/kstandardshortcut.cpp:292 msgctxt "KStandardShortcut|@action" msgid "Save As" -msgstr "Anomena i guarda com a" +msgstr "Anomena i guarda" #: gui/kstandardshortcut.cpp:293 msgctxt "KStandardShortcut|@action" @@ -516,7 +516,7 @@ "Group to look in. Use \"<default>\" for the root group, or use repeatedly " "for nested groups." msgstr "" -"Grup on buscar. Useu ??<predeterminat>?? per al grup arrel, o useu-lo " +"Grup on buscar. Utilitzeu ??<predeterminat>?? per al grup arrel, o useu-lo " "repetidament per a grups imbricats." #: kreadconfig/kreadconfig.cpp:52 kreadconfig/kwriteconfig.cpp:31 @@ -527,7 +527,7 @@ #: kreadconfig/kreadconfig.cpp:53 msgctxt "main|" msgid "Default value" -msgstr "Valor per defecte" +msgstr "Valor predeterminat" #: kreadconfig/kreadconfig.cpp:54 msgctxt "main|" @@ -546,7 +546,7 @@ "Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a " "string" msgstr "" -"Tipus de variable. Utilitza ??bool?? per a un boole??. En un altre cas, es " +"Tipus de variable. Utilitza ??bool?? per a un boole??. En un atre cas, es " "tracta com una cadena" #: kreadconfig/kwriteconfig.cpp:36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/po/pl/kconfig5_qt.po new/kconfig-5.94.0/po/pl/kconfig5_qt.po --- old/kconfig-5.93.0/po/pl/kconfig5_qt.po 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/po/pl/kconfig5_qt.po 2022-05-07 23:17:52.000000000 +0200 @@ -2,13 +2,13 @@ # Copyright (C) 2003, 2008 Free Software Foundation, Inc. # # Michal Rudolf <[email protected]>, 2003, 2008. -# ??ukasz Wojni??owicz <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2020, 2021. +# ??ukasz Wojni??owicz <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2021-12-30 13:14+0100\n" +"PO-Revision-Date: 2022-04-10 11:32+0200\n" "Last-Translator: ??ukasz Wojni??owicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -440,7 +440,7 @@ #: gui/kstandardshortcut.cpp:380 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "Przenie?? do kosza" +msgstr "Wyrzu?? do kosza" #: gui/kstandardshortcut.cpp:386 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/po/ro/kconfig5_qt.po new/kconfig-5.94.0/po/ro/kconfig5_qt.po --- old/kconfig-5.93.0/po/ro/kconfig5_qt.po 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/po/ro/kconfig5_qt.po 2022-05-07 23:17:52.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2022-02-05 15:51+0000\n" +"PO-Revision-Date: 2022-02-17 22:38+0000\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian\n" "Language: ro\n" @@ -418,7 +418,7 @@ #: gui/kstandardshortcut.cpp:366 msgctxt "KStandardShortcut|@action" msgid "Configure Language..." -msgstr "Configurare limb??..." +msgstr "Configureaz?? limba" #: gui/kstandardshortcut.cpp:372 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/po/sk/kconfig5_qt.po new/kconfig-5.94.0/po/sk/kconfig5_qt.po --- old/kconfig-5.93.0/po/sk/kconfig5_qt.po 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/po/sk/kconfig5_qt.po 2022-05-07 23:17:52.000000000 +0200 @@ -1,6 +1,6 @@ # translation of kwriteconfig.po to Slovak # Michal Sulek <[email protected]>, 2009. -# Roman Pahol??k <[email protected]>, 2014, 2015, 2016. +# Roman Pahol??k <[email protected]>, 2014, 2015, 2016, 2022. # Mthw <[email protected]>, 2019. # Matej Mrenica <[email protected]>, 2019, 2020. msgid "" @@ -8,14 +8,14 @@ "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2020-12-31 12:41+0100\n" -"Last-Translator: Matej Mrenica <[email protected]>\n" -"Language-Team: Slovak <[email protected]>\n" +"PO-Revision-Date: 2022-04-18 17:45+0200\n" +"Last-Translator: Roman Paholik <[email protected]>\n" +"Language-Team: Slovak <[email protected]>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.12.0\n" +"X-Generator: Lokalize 21.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Qt-Contexts: true\n" @@ -506,14 +506,13 @@ msgstr "Pou??i?? <s??bor> namiesto glob??lneho konfigura??n??ho s??boru" #: kreadconfig/kreadconfig.cpp:49 kreadconfig/kwriteconfig.cpp:28 -#, fuzzy -#| msgctxt "main|" -#| msgid "Group to look in. Use repeatedly for nested groups." msgctxt "main|" msgid "" "Group to look in. Use \"<default>\" for the root group, or use repeatedly " "for nested groups." -msgstr "Skupina k preh??ad??vaniu. Pou??ite opakovane pre vnoren?? skupiny." +msgstr "" +"Skupina k preh??ad??vaniu. Pou??ite <default> pre kore??ov?? skupinu alebo " +"pou??ite opakovane pre vnoren?? skupiny." #: kreadconfig/kreadconfig.cpp:52 kreadconfig/kwriteconfig.cpp:31 msgctxt "main|" @@ -534,6 +533,7 @@ msgctxt "main|" msgid "Group name cannot be empty, use \"<default>\" for the root group" msgstr "" +"N??zov skupiny nem????e by?? pr??zdny, pou??ite <default> pre kore??ov?? skupinu" #: kreadconfig/kwriteconfig.cpp:34 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.94.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.93.0/po/zh_CN/kconfig5_qt.po 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/po/zh_CN/kconfig5_qt.po 2022-05-07 23:17:52.000000000 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-03-31 13:29\n" +"PO-Revision-Date: 2022-04-26 15:18\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/src/core/conversioncheck.h new/kconfig-5.94.0/src/core/conversioncheck.h --- old/kconfig-5.93.0/src/core/conversioncheck.h 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/src/core/conversioncheck.h 2022-05-07 23:17:52.000000000 +0200 @@ -14,6 +14,7 @@ #include <QSize> #include <QString> #include <QVariant> +#include <QUuid> class QColor; class QFont; @@ -107,6 +108,7 @@ QVConversions(QVariantList, unsupported, supported); QVConversions(QUrl, supported, supported); QVConversions(QList<QUrl>, unsupported, supported); +QVConversions(QUuid, supported, supported); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.93.0/src/core/kconfiggroup.cpp new/kconfig-5.94.0/src/core/kconfiggroup.cpp --- old/kconfig-5.93.0/src/core/kconfiggroup.cpp 2022-04-02 12:16:30.000000000 +0200 +++ new/kconfig-5.94.0/src/core/kconfiggroup.cpp 2022-05-07 23:17:52.000000000 +0200 @@ -25,6 +25,7 @@ #include <QString> #include <QTextStream> #include <QUrl> +#include <QUuid> #include <algorithm> #include <array> @@ -230,6 +231,8 @@ // imho if processed string is wanted should call // readEntry(key, QString) not readEntry(key, QVariant) return QString::fromUtf8(value); + case QMetaType::QUuid: + return QUuid::fromString(QString::fromUtf8(value)); case QMetaType::QVariantList: case QMetaType::QStringList: return KConfigGroupPrivate::deserializeList(QString::fromUtf8(value)); @@ -422,16 +425,13 @@ return path; } - // we can not use KGlobal::dirs()->relativeLocation("home", path) here, - // since it would not recognize paths without a trailing '/'. - // All of the 3 following functions to return the user's home directory - // can return different paths. We have to test all them. - const QString homeDir0 = QFile::decodeName(qgetenv("HOME")); - const QString homeDir1 = QDir::homePath(); - const QString homeDir2 = QDir(homeDir1).canonicalPath(); - if (cleanHomeDirPath(path, homeDir0) || cleanHomeDirPath(path, homeDir1) || cleanHomeDirPath(path, homeDir2)) { - // qDebug() << "Path was replaced\n"; - } + // Use the same thing as what expandString() will do, to keep data intact +#ifdef Q_OS_WIN + const QString homeDir = QDir::homePath(); +#else + const QString homeDir = QFile::decodeName(qgetenv("HOME")); +#endif + (void)cleanHomeDirPath(path, homeDir); if (startsWithFile) { path = QUrl::fromLocalFile(path).toString(); @@ -986,6 +986,10 @@ writeEntry(key, list, flags); return; } + case QMetaType::QUuid: { + writeEntry(key, value.toString(), flags); + return; + } case QMetaType::QSizeF: { const QSizeF rSizeF = value.toSizeF();
