Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2018-11-14 14:31:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Wed Nov 14 14:31:57 2018 rev:61 rq:648499 version:5.52.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2018-10-22 11:09:55.851943626 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2018-11-14 14:32:20.847387094 +0100 @@ -1,0 +2,15 @@ +Sun Nov 11 19:48:03 UTC 2018 - [email protected] + +- Update to 5.52.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.52.0.php +- Changes since 5.51.0: + * Remove unused variable + * Fix logic error in NotifyFlag testing + * Set explicit arg type in QCOMPARE + * Fix compilation without D-Bus + * Add mechanism to notify other clients of config changes over DBus + * Expose getter method for KConfig::addConfigSources + +------------------------------------------------------------------- Old: ---- kconfig-5.51.0.tar.xz New: ---- kconfig-5.52.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.6nlDuK/_old 2018-11-14 14:32:21.407386551 +0100 +++ /var/tmp/diff_new_pack.6nlDuK/_new 2018-11-14 14:32:21.411386546 +0100 @@ -17,14 +17,14 @@ %define sonum 5 -%define _tar_path 5.51 +%define _tar_path 5.52 # 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.51.0 +Version: 5.52.0 Release: 0 Summary: Provides an advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ kconfig-5.51.0.tar.xz -> kconfig-5.52.0.tar.xz ++++++ ++++ 4162 lines of diff (skipped) ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.6nlDuK/_old 2018-11-14 14:32:21.591386371 +0100 +++ /var/tmp/diff_new_pack.6nlDuK/_new 2018-11-14 14:32:21.595386368 +0100 @@ -5,7 +5,7 @@ @@ -983,6 +983,19 @@ QByteArray KConfigPrivate::lookupData(co return it->mValue; } - + +QByteArray KConfigPrivate::lookupExactData(const QByteArray &group, const char *key, + KEntryMap::SearchFlags flags) const +{ @@ -31,7 +31,7 @@ bool *expand) const; QByteArray lookupData(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); Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfigdata.h @@ -41,7 +41,7 @@ @@ -180,6 +180,19 @@ public: Iterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - + + ConstIterator findExactEntry(const QByteArray &group, const QByteArray &key = QByteArray(), + SearchFlags flags = SearchFlags()) const + { @@ -57,7 +57,7 @@ + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - + Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfiggroup.cpp =================================================================== --- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfiggroup.cpp @@ -65,7 +65,7 @@ @@ -1201,6 +1201,18 @@ bool KConfigGroup::hasKey(const char *ke 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"); @@ -88,7 +88,7 @@ @@ -623,6 +623,11 @@ public: */ QMap<QString, QString> entryMap() const; - + + /** + * @internal + */ @@ -106,13 +106,13 @@ #include <QUrl> #include <qstandardpaths.h> +#include <libintl.h> - + #include "kauthorized.h" #include "kconfig_p.h" @@ -169,6 +170,33 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } - + +QString KDesktopFile::translatedEntry(const char *key) const +{ + Q_D(const KDesktopFile); @@ -144,28 +144,28 @@ { Q_D(const KDesktopFile); @@ -183,20 +211,17 @@ QString KDesktopFile::readIcon() const - + 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.44.0git.20180504T173454~5625e0d/src/core/kdesktopfile.h =================================================================== @@ -174,9 +174,9 @@ @@ -255,6 +255,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: - + + QString translatedEntry(const char *) const; + Q_DISABLE_COPY(KDesktopFile) - + Q_DECLARE_PRIVATE(KDesktopFile)
