Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2018-06-22 13:18:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Fri Jun 22 13:18:18 2018 rev:56 rq:616744 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2018-05-18 14:20:20.147033863 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2018-06-22 13:19:14.654447737 +0200 @@ -1,0 +2,11 @@ +Tue Jun 12 21:26:03 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * KConfigCompiler_Test: Update test_signal.h.ref to follow the generated file + * kcfg.xsd - do not require a kcfgfile element + +------------------------------------------------------------------- Old: ---- kconfig-5.46.0.tar.xz New: ---- kconfig-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.k97sQ3/_old 2018-06-22 13:19:15.678409769 +0200 +++ /var/tmp/diff_new_pack.k97sQ3/_new 2018-06-22 13:19:15.682409621 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.46 +%define _tar_path 5.47 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kconfig -Version: 5.46.0 +Version: 5.47.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kconfig-5.46.0.tar.xz -> kconfig-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/CMakeLists.txt new/kconfig-5.47.0/CMakeLists.txt --- old/kconfig-5.46.0/CMakeLists.txt 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/CMakeLists.txt 2018-06-02 19:49:40.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/autotests/kconfig_compiler/test_signal.h.ref new/kconfig-5.47.0/autotests/kconfig_compiler/test_signal.h.ref --- old/kconfig-5.46.0/autotests/kconfig_compiler/test_signal.h.ref 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/autotests/kconfig_compiler/test_signal.h.ref 2018-06-02 19:49:40.000000000 +0200 @@ -139,7 +139,7 @@ TestSignal(); friend class TestSignalHelper; - bool usrSave() Q_DECL_OVERRIDE; + bool usrSave() override; // Appearance QString mEmoticonTheme; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/id/kconfig5_qt.po new/kconfig-5.47.0/po/id/kconfig5_qt.po --- old/kconfig-5.46.0/po/id/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/id/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -10,7 +10,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: 2018-04-03 21:35+0700\n" +"PO-Revision-Date: 2018-05-29 00:04+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -441,7 +441,7 @@ #: gui/kstandardshortcut.cpp:169 msgctxt "KStandardShortcut|@action" msgid "Move to Trash" -msgstr "Pindah ke Tong Sampah" +msgstr "Pindah ke Sesampahan" #: gui/kstandardshortcut.cpp:170 msgctxt "KStandardShortcut|@action" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/sr/kconfig5_qt.po new/kconfig-5.47.0/po/sr/kconfig5_qt.po --- old/kconfig-5.46.0/po/sr/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/sr/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -30,8 +30,8 @@ msgid "Configuration file \"%1\" not writable.\n" msgstr "Не може се писати у поставни фајл „%1“.\n" -#: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 -#: core/kemailsettings.cpp:267 +#: core/kemailsettings.cpp:238 core/kemailsettings.cpp:241 +#: core/kemailsettings.cpp:249 msgctxt "KEMailSettings|" msgid "Default" msgstr "Подразумевано" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/sr@ijekavian/kconfig5_qt.po new/kconfig-5.47.0/po/sr@ijekavian/kconfig5_qt.po --- old/kconfig-5.46.0/po/sr@ijekavian/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/sr@ijekavian/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -30,8 +30,8 @@ msgid "Configuration file \"%1\" not writable.\n" msgstr "Не може се писати у поставни фајл „%1“.\n" -#: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 -#: core/kemailsettings.cpp:267 +#: core/kemailsettings.cpp:238 core/kemailsettings.cpp:241 +#: core/kemailsettings.cpp:249 msgctxt "KEMailSettings|" msgid "Default" msgstr "Подразумевано" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/sr@ijekavianlatin/kconfig5_qt.po new/kconfig-5.47.0/po/sr@ijekavianlatin/kconfig5_qt.po --- old/kconfig-5.46.0/po/sr@ijekavianlatin/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/sr@ijekavianlatin/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -30,8 +30,8 @@ msgid "Configuration file \"%1\" not writable.\n" msgstr "Ne može se pisati u postavni fajl „%1“.\n" -#: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 -#: core/kemailsettings.cpp:267 +#: core/kemailsettings.cpp:238 core/kemailsettings.cpp:241 +#: core/kemailsettings.cpp:249 msgctxt "KEMailSettings|" msgid "Default" msgstr "Podrazumevano" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/sr@latin/kconfig5_qt.po new/kconfig-5.47.0/po/sr@latin/kconfig5_qt.po --- old/kconfig-5.46.0/po/sr@latin/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/sr@latin/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -30,8 +30,8 @@ msgid "Configuration file \"%1\" not writable.\n" msgstr "Ne može se pisati u postavni fajl „%1“.\n" -#: core/kemailsettings.cpp:256 core/kemailsettings.cpp:259 -#: core/kemailsettings.cpp:267 +#: core/kemailsettings.cpp:238 core/kemailsettings.cpp:241 +#: core/kemailsettings.cpp:249 msgctxt "KEMailSettings|" msgid "Default" msgstr "Podrazumevano" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.47.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.46.0/po/zh_CN/kconfig5_qt.po 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/po/zh_CN/kconfig5_qt.po 2018-06-02 19:49:40.000000000 +0200 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-26 05:22-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.46.0/src/kconfig_compiler/kcfg.xsd new/kconfig-5.47.0/src/kconfig_compiler/kcfg.xsd --- old/kconfig-5.46.0/src/kconfig_compiler/kcfg.xsd 2018-05-05 14:56:11.000000000 +0200 +++ new/kconfig-5.47.0/src/kconfig_compiler/kcfg.xsd 2018-06-02 19:49:40.000000000 +0200 @@ -61,7 +61,7 @@ <xsd:complexType> <xsd:sequence> <xsd:element name="include" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/> - <xsd:element name="kcfgfile" > + <xsd:element name="kcfgfile" minOccurs="0" maxOccurs="1" > <xsd:complexType> <xsd:sequence> <xsd:element name="parameter" type="kcfg:parameter" minOccurs="0" maxOccurs="unbounded" /> @@ -231,4 +231,3 @@ </xsd:simpleContent> </xsd:complexType> </xsd:schema> - ++++++ kconfig-desktop-translations.patch ++++++ --- /var/tmp/diff_new_pack.k97sQ3/_old 2018-06-22 13:19:15.894401760 +0200 +++ /var/tmp/diff_new_pack.k97sQ3/_new 2018-06-22 13:19:15.898401612 +0200 @@ -1,11 +1,11 @@ -Index: kconfig-5.46.0/src/core/kconfig.cpp +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfig.cpp =================================================================== ---- kconfig-5.46.0.orig/src/core/kconfig.cpp -+++ kconfig-5.46.0/src/core/kconfig.cpp +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfig.cpp ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfig.cpp @@ -983,6 +983,19 @@ QByteArray KConfigPrivate::lookupData(co return it->mValue; } - + +QByteArray KConfigPrivate::lookupExactData(const QByteArray &group, const char *key, + KEntryMap::SearchFlags flags) const +{ @@ -22,26 +22,26 @@ QString KConfigPrivate::lookupData(const QByteArray &group, const char *key, KEntryMap::SearchFlags flags, bool *expand) const { -Index: kconfig-5.46.0/src/core/kconfig_p.h +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfig_p.h =================================================================== ---- kconfig-5.46.0.orig/src/core/kconfig_p.h -+++ kconfig-5.46.0/src/core/kconfig_p.h +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfig_p.h ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfig_p.h @@ -47,6 +47,7 @@ public: 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; + 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.46.0/src/core/kconfigdata.h +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfigdata.h =================================================================== ---- kconfig-5.46.0.orig/src/core/kconfigdata.h -+++ kconfig-5.46.0/src/core/kconfigdata.h +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfigdata.h ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfigdata.h @@ -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,15 +57,15 @@ + Iterator findEntry(const QByteArray &group, const QByteArray &key = QByteArray(), SearchFlags flags = SearchFlags()); - -Index: kconfig-5.46.0/src/core/kconfiggroup.cpp + +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfiggroup.cpp =================================================================== ---- kconfig-5.46.0.orig/src/core/kconfiggroup.cpp -+++ kconfig-5.46.0/src/core/kconfiggroup.cpp +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfiggroup.cpp ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfiggroup.cpp @@ -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"); @@ -81,14 +81,14 @@ bool KConfigGroup::hasKey(const QString &key) const { return hasKey(key.toUtf8().constData()); -Index: kconfig-5.46.0/src/core/kconfiggroup.h +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfiggroup.h =================================================================== ---- kconfig-5.46.0.orig/src/core/kconfiggroup.h -+++ kconfig-5.46.0/src/core/kconfiggroup.h +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kconfiggroup.h ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kconfiggroup.h @@ -623,6 +623,11 @@ public: */ QMap<QString, QString> entryMap() const; - + + /** + * @internal + */ @@ -97,22 +97,22 @@ protected: bool hasGroupImpl(const QByteArray &group) const override; KConfigGroup groupImpl(const QByteArray &b) override; -Index: kconfig-5.46.0/src/core/kdesktopfile.cpp +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kdesktopfile.cpp =================================================================== ---- kconfig-5.46.0.orig/src/core/kdesktopfile.cpp -+++ kconfig-5.46.0/src/core/kdesktopfile.cpp +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kdesktopfile.cpp ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kdesktopfile.cpp @@ -29,6 +29,7 @@ #include <QFileInfo> #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,39 +144,39 @@ { 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.46.0/src/core/kdesktopfile.h +Index: kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kdesktopfile.h =================================================================== ---- kconfig-5.46.0.orig/src/core/kdesktopfile.h -+++ kconfig-5.46.0/src/core/kdesktopfile.h +--- kconfig-5.44.0git.20180504T173454~5625e0d.orig/src/core/kdesktopfile.h ++++ kconfig-5.44.0git.20180504T173454~5625e0d/src/core/kdesktopfile.h @@ -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)
