Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2021-11-15 15:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon Nov 15 15:24:57 2021 rev:100 rq:931068 version:5.88.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2021-10-18 22:00:04.794001890 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new.1890/kconfig.changes 2021-11-15 15:26:05.805818396 +0100 @@ -1,0 +2,22 @@ +Sun Nov 7 09:13:12 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Strip 'Source' URL for faster submissions + +------------------------------------------------------------------- +Sun Nov 7 09:07:53 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.88.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.88.0 +- Changes since 5.87.0: + * Exclude new enum-overload from python bindings build + * Enforce KAuthorized enums being not 0 + * Create enum to to authorize common keys + * Do not try to generate python bindings for KConfigGroup::moveValuesTo + * Create utility method for moving entries from one group to another + * Add FreeBSD CI + * Add Android CI +- Rebase kconfig-desktop-translations.patch + +------------------------------------------------------------------- Old: ---- kconfig-5.87.0.tar.xz kconfig-5.87.0.tar.xz.sig New: ---- kconfig-5.88.0.tar.xz kconfig-5.88.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.YSuNJm/_old 2021-11-15 15:26:06.285818531 +0100 +++ /var/tmp/diff_new_pack.YSuNJm/_new 2021-11-15 15:26:06.289818531 +0100 @@ -17,22 +17,22 @@ %define sonum 5 -%define _tar_path 5.87 +%define _tar_path 5.88 # 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 lang Name: kconfig -Version: 5.87.0 +Version: 5.88.0 Release: 0 Summary: Advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif # PATCH-FEATURE-OPENSUSE ++++++ kconfig-5.87.0.tar.xz -> kconfig-5.88.0.tar.xz ++++++ ++++ 4062 lines of diff (skipped) ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.YSuNJm/_old 2021-11-15 15:26:06.521818597 +0100 +++ /var/tmp/diff_new_pack.YSuNJm/_new 2021-11-15 15:26:06.521818597 +0100 @@ -1,11 +1,29 @@ -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfig.cpp -=================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfig.cpp 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfig.cpp 2021-03-08 00:03:57.177743371 +0100 -@@ -976,6 +976,20 @@ +From 6673a1afb304714d05ccfb0a3e257d58388f8f2f Mon Sep 17 00:00:00 2001 +From: Not sure who <> +Date: Tue, 12 Oct 2021 14:02:41 +0200 +Subject: [PATCH] Translate desktop entries using gettext + +For the desktop-file-translations mechanism: +https://github.com/openSUSE/desktop-file-translations + +--- + src/core/kconfig.cpp | 13 +++++++++++++ + src/core/kconfig_p.h | 1 + + src/core/kconfigdata_p.h | 14 ++++++++++++++ + src/core/kconfiggroup.cpp | 12 ++++++++++++ + src/core/kconfiggroup.h | 5 +++++ + src/core/kdesktopfile.cpp | 37 +++++++++++++++++++++++++++++++------ + src/core/kdesktopfile.h | 2 ++ + 7 files changed, 78 insertions(+), 6 deletions(-) + +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfig.cpp +=================================================================== +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kconfig.cpp 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfig.cpp 2021-10-21 06:19:57.137385745 +0200 +@@ -1008,6 +1008,19 @@ } } - + +QByteArray KConfigPrivate::lookupExactData(const QByteArray &group, const char *key, + KEntryMap::SearchFlags flags) const +{ @@ -19,30 +37,29 @@ + return it->mValue; +} + -+ QByteArray KConfigPrivate::lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const { - if (bReadDefaults) { -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfig_p.h + return lookupInternalEntry(group, key, flags).mValue; +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfig_p.h =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfig_p.h 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfig_p.h 2021-03-08 00:03:57.177743371 +0100 -@@ -34,6 +34,7 @@ - bool canWriteEntry(const QByteArray &group, const char *key, bool isDefault = false) const; +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kconfig_p.h 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfig_p.h 2021-10-21 06:19:57.137385745 +0200 +@@ -35,6 +35,7 @@ QString lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const; QByteArray lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; + KEntry lookupInternalEntry(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; + QByteArray lookupExactData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags) const; - + void putData(const QByteArray &group, const char *key, const QByteArray &value, KConfigBase::WriteConfigFlags flags, bool expand = false); - void revertEntry(const QByteArray &group, const char *key, KConfigBase::WriteConfigFlags flags); -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata_p.h + void setEntryData(const QByteArray &group, const char *key, const QByteArray &value, KEntryMap::EntryOptions flags) +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfigdata_p.h =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfigdata_p.h 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfigdata_p.h 2021-03-08 00:03:57.177743371 +0100 +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kconfigdata_p.h 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfigdata_p.h 2021-10-21 06:19:57.137385745 +0200 @@ -192,6 +192,20 @@ - + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - + + ConstIterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), + SearchFlags flags = SearchFlags()) const + { @@ -60,14 +77,14 @@ ConstIterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()) const { return constFindEntry(group, key, flags); -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfiggroup.cpp +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfiggroup.cpp =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfiggroup.cpp 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfiggroup.cpp 2021-03-08 00:03:57.177743371 +0100 -@@ -1162,6 +1162,18 @@ +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kconfiggroup.cpp 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfiggroup.cpp 2021-10-21 06:19:57.137385745 +0200 +@@ -1163,6 +1163,18 @@ return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } - + +bool KConfigGroup::hasTranslatedKey(const char *key) const +{ + Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); @@ -83,14 +100,14 @@ bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfiggroup.h +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfiggroup.h =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kconfiggroup.h 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kconfiggroup.h 2021-03-08 00:03:57.177743371 +0100 -@@ -699,6 +699,11 @@ +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kconfiggroup.h 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kconfiggroup.h 2021-10-21 06:19:57.137385745 +0200 +@@ -707,6 +707,11 @@ */ QMap<QString, QString> entryMap() const; - + + /** + * @internal + */ @@ -99,22 +116,22 @@ protected: bool hasGroupImpl(const QByteArray &group) const override; KConfigGroup groupImpl(const QByteArray &b) override; -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kdesktopfile.cpp +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kdesktopfile.cpp =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kdesktopfile.cpp 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kdesktopfile.cpp 2021-03-08 00:03:57.177743371 +0100 +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kdesktopfile.cpp 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kdesktopfile.cpp 2021-10-21 06:19:57.137385745 +0200 @@ -18,6 +18,7 @@ #include <QFileInfo> #include <QStandardPaths> #include <QUrl> +#include <libintl.h> - + #ifndef Q_OS_WIN #include <unistd.h> @@ -166,6 +167,33 @@ return false; } - + +QString KDesktopFile::translatedEntry(const char *key) const +{ + Q_D(const KDesktopFile); @@ -146,40 +163,39 @@ { Q_D(const KDesktopFile); @@ -180,20 +208,17 @@ - + QString KDesktopFile::readName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Name", QString()); + return translatedEntry("Name"); } - + QString KDesktopFile::readComment() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("Comment", QString()); + return translatedEntry("Comment"); } - + QString KDesktopFile::readGenericName() const { - Q_D(const KDesktopFile); - return d->desktopGroup.readEntry("GenericName", QString()); + return translatedEntry("GenericName"); } - + QString KDesktopFile::readPath() const -Index: kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kdesktopfile.h +Index: kconfig-5.62.0git.20211020T111249~605383b/src/core/kdesktopfile.h =================================================================== ---- kconfig-5.62.0git.20210306T013509~d5ca63b.orig/src/core/kdesktopfile.h 2021-03-06 00:35:09.000000000 +0100 -+++ kconfig-5.62.0git.20210306T013509~d5ca63b/src/core/kdesktopfile.h 2021-03-08 00:03:57.177743371 +0100 -@@ -243,6 +243,9 @@ - */ - // virtual void virtual_hook( int id, void* data ); +--- kconfig-5.62.0git.20211020T111249~605383b.orig/src/core/kdesktopfile.h 2021-10-20 11:12:49.000000000 +0200 ++++ kconfig-5.62.0git.20211020T111249~605383b/src/core/kdesktopfile.h 2021-10-21 06:19:57.137385745 +0200 +@@ -243,6 +243,8 @@ + QStandardPaths::StandardLocation resource() const; + private: -+ + QString translatedEntry(const char *) const; + Q_DISABLE_COPY(KDesktopFile) - + Q_DECLARE_PRIVATE(KDesktopFile)
