Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2018-10-22 11:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon Oct 22 11:09:53 2018 rev:60 rq:642302 version:5.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2018-10-01 08:05:08.886393501 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2018-10-22 11:09:55.851943626 +0200 @@ -1,0 +2,20 @@ +Tue Oct 16 08:01:56 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:51:47 UTC 2018 - [email protected] + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * Remove misleading use of KDE_INSTALL_PYTHONBINDINGSDIR + * Fix issue when reading path lists + * API dox: 0 -> nullptr + * kcfg_compiler now documents valid inputs for its 'Color' type + * whitespace cleanup + * Port deprecated method + use strict compile flags + +------------------------------------------------------------------- Old: ---- kconfig-5.50.0.tar.xz New: ---- kconfig-5.51.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.h02dsx/_old 2018-10-22 11:09:56.539943064 +0200 +++ /var/tmp/diff_new_pack.h02dsx/_new 2018-10-22 11:09:56.543943062 +0200 @@ -12,24 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sonum 5 -%define _tar_path 5.50 +%define _tar_path 5.51 # 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.50.0 +Version: 5.51.0 Release: 0 Summary: Provides an advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/GUI/KDE -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FEATURE-OPENSUSE @@ -39,6 +39,7 @@ BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.6.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 BuildRequires: cmake(Qt5Gui) >= 5.6.0 BuildRequires: cmake(Qt5Xml) >= 5.6.0 %if %{with lang} ++++++ kconfig-5.50.0.tar.xz -> kconfig-5.51.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/CMakeLists.txt new/kconfig-5.51.0/CMakeLists.txt --- old/kconfig-5.50.0/CMakeLists.txt 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/CMakeLists.txt 2018-10-08 10:11:01.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.50.0") # handled by release scripts +set(KF5_VERSION "5.51.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.50.0 NO_MODULE) +find_package(ECM 5.51.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) @@ -36,6 +36,11 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigConfigVersion.cmake" SOVERSION 5) +add_definitions(-DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_CAST_TO_ASCII) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_USE_QSTRINGBUILDER) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/autotests/fallbackconfigresourcestest.cpp new/kconfig-5.51.0/autotests/fallbackconfigresourcestest.cpp --- old/kconfig-5.50.0/autotests/fallbackconfigresourcestest.cpp 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/autotests/fallbackconfigresourcestest.cpp 2018-10-08 10:11:01.000000000 +0200 @@ -32,7 +32,7 @@ void FallbackConfigResourcesTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); } void FallbackConfigResourcesTest::testResourceFallbackFile() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/autotests/kconfigtest.cpp new/kconfig-5.51.0/autotests/kconfigtest.cpp --- old/kconfig-5.50.0/autotests/kconfigtest.cpp 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/autotests/kconfigtest.cpp 2018-10-08 10:11:01.000000000 +0200 @@ -521,7 +521,9 @@ << "withBraces[$e]=file://${HOME}/foo" << endl << "URL[$e]=file://${HOME}/foo" << endl << "hostname[$e]=$(hostname)" << endl - << "noeol=foo"; // no EOL + << "escapes=aaa,bb/b,ccc\\,ccc" << endl + << "noeol=foo" // no EOL + ; } KConfig cf2(TEST_SUBDIR "pathtest"); KConfigGroup group = cf2.group("Test Group"); @@ -547,6 +549,9 @@ #endif QVERIFY(group.hasKey("noeol")); QCOMPARE(group.readEntry("noeol", QString()), QString("foo")); + + const auto val = QStringList { QStringLiteral("aaa"), QStringLiteral("bb/b"), QStringLiteral("ccc,ccc")}; + QCOMPARE(group.readPathEntry("escapes", QStringList()), val); } void KConfigTest::testPersistenceOfExpandFlagForPath() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/autotests/kdesktopfiletest.cpp new/kconfig-5.51.0/autotests/kdesktopfiletest.cpp --- old/kconfig-5.50.0/autotests/kdesktopfiletest.cpp 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/autotests/kdesktopfiletest.cpp 2018-10-08 10:11:01.000000000 +0200 @@ -29,7 +29,7 @@ void KDesktopFileTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); KConfigGroup actionRestrictions(KSharedConfig::openConfig(), "KDE Action Restrictions"); actionRestrictions.writeEntry("someBlockedAction", false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/autotests/ksharedconfigtest.cpp new/kconfig-5.51.0/autotests/ksharedconfigtest.cpp --- old/kconfig-5.50.0/autotests/ksharedconfigtest.cpp 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/autotests/ksharedconfigtest.cpp 2018-10-08 10:11:01.000000000 +0200 @@ -37,7 +37,7 @@ void KSharedConfigTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); m_path = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + QCoreApplication::applicationName() + QStringLiteral("rc"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/po/zh_CN/kconfig5_qt.po new/kconfig-5.51.0/po/zh_CN/kconfig5_qt.po --- old/kconfig-5.50.0/po/zh_CN/kconfig5_qt.po 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/po/zh_CN/kconfig5_qt.po 2018-10-08 10:11:01.000000000 +0200 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-08-30 13:09\n" -"Last-Translator: guoyunhebrave <[email protected]>\n" +"PO-Revision-Date: 2018-09-28 19:47\n" +"Last-Translator: guoyunhe <[email protected]>\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.50.0/src/core/CMakeLists.txt new/kconfig-5.51.0/src/core/CMakeLists.txt --- old/kconfig-5.50.0/src/core/CMakeLists.txt 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/src/core/CMakeLists.txt 2018-10-08 10:11:01.000000000 +0200 @@ -56,7 +56,6 @@ PYTHONNAMESPACE PyKF5 MODULENAME KConfigCore RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py" - INSTALL_DIR_SUFFIX ${KDE_INSTALL_PYTHONBINDINGSDIR} SIP_DEPENDS QtCore/QtCoremod.sip HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/src/core/kconfigini.cpp new/kconfig-5.51.0/src/core/kconfigini.cpp --- old/kconfig-5.50.0/src/core/kconfigini.cpp 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/src/core/kconfigini.cpp 2018-10-08 10:11:01.000000000 +0200 @@ -793,6 +793,12 @@ r++; *r = ';'; break; + case ',': + // not really an escape sequence, but allowed in .desktop files, don't strip '\,' from the string + *r = '\\'; + r++; + *r = ','; + break; case 'x': if (i + 2 < l) { *r = charFromHex(str + i + 1, file, line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/src/gui/CMakeLists.txt new/kconfig-5.51.0/src/gui/CMakeLists.txt --- old/kconfig-5.50.0/src/gui/CMakeLists.txt 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/src/gui/CMakeLists.txt 2018-10-08 10:11:01.000000000 +0200 @@ -40,7 +40,6 @@ PYTHONNAMESPACE PyKF5 MODULENAME KConfigGui RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py" - INSTALL_DIR_SUFFIX ${KDE_INSTALL_PYTHONBINDINGSDIR} SIP_INCLUDES "${CMAKE_BINARY_DIR}/src/core/sip" SIP_DEPENDS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/src/gui/kconfigloader.h new/kconfig-5.51.0/src/gui/kconfigloader.h --- old/kconfig-5.50.0/src/gui/kconfigloader.h 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/src/gui/kconfigloader.h 2018-10-08 10:11:01.000000000 +0200 @@ -138,7 +138,7 @@ * * @param group the group in the config file to look in * @param key the configuration key to find - * @return the associated KConfigSkeletonItem, or 0 if none + * @return the associated KConfigSkeletonItem, or @c nullptr if none */ KConfigSkeletonItem *findItem(const QString &group, const QString &key) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.50.0/src/kconfig_compiler/README.dox new/kconfig-5.51.0/src/kconfig_compiler/README.dox --- old/kconfig-5.50.0/src/kconfig_compiler/README.dox 2018-09-02 21:14:41.000000000 +0200 +++ new/kconfig-5.51.0/src/kconfig_compiler/README.dox 2018-10-08 10:11:01.000000000 +0200 @@ -1,9 +1,9 @@ /** \page kconfig_compiler The KDE Configuration Compiler -kconfig_compiler generates C++ source code from an XML file containing -information about configuration options (.kcfg) and a file that provides -the code generation options (.kcfgc) The generated class is based on +kconfig_compiler generates C++ source code from an XML file containing +information about configuration options (.kcfg) and a file that provides +the code generation options (.kcfgc) The generated class is based on KConfigSkeleton and provides an API for the application to access its configuration data. @@ -26,7 +26,7 @@ a \#include "..." statement instead of \#include \<...\>, enclose the header file name in double quotes (e.g. \<include\>"header.h"\</include\>). -The remaining entries in the XML file are grouped by the tag \<group\> +The remaining entries in the XML file are grouped by the tag \<group\> which describes the corresponding group in the configuration file. The individual entries must have at least a name or a key. The key is used @@ -41,10 +41,10 @@ (e.g. Pixmap, Image...) which are not supported. Besides those basic types the following special types are supported: -- Path This is a string that is specially treated as a file-path. +- Path This is a string that is specially treated as a file-path. In particular paths in the home directory are prefixed with $HOME in when being stored in the configuration file. - + - Enum This indicates an enumeration. The possible enum values and optional enum name should be provided via the \<choices\> tag. Enum values are accessed as integers by the application but stored as strings in the @@ -55,6 +55,11 @@ to the application as QValueList<int>. Useful for storing QSplitter geometries. +- Color isn't a special type but has special input. It is generated as QColor. + Any valid input to QColor(QString) can be used (hex or SVG keyword notation) + as well as a special format r,g,b,a where the a denotes the alpha channel and + may be omitted. + An entry can optionally have a default value which is used as default when the value isn't specified in any config file. Default values are interpreted as literal constant values. If a default value needs to be computed @@ -118,7 +123,7 @@ <td><b>Visibility</b></td> <td>string</td> <td>-</td> - <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class + <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class name in header file</td> </tr> <tr> @@ -162,7 +167,7 @@ <td>false</td> <td>If true, mutator functions for all configuration options are generated. If false, no mutator functions are generated. If a list is provided, - mutator functions are generated for the options that are listed.</td> + mutator functions are generated for the options that are listed.</td> </tr> <tr> <td><b>DefaultValueGetters</b></td> @@ -170,7 +175,7 @@ <td>false</td> <td>If true, functions to return the default value of all configuration options are generated. If false, no default value functions are generated. If a list - is provided, default value functions are generated for the options that are listed.</td> + is provided, default value functions are generated for the options that are listed.</td> </tr> <tr> <td><b>ItemAccessors</b></td> @@ -269,7 +274,7 @@ \endverbatim The configuration options will be accessible to the application via -a QColor color(int ColorIndex) and a +a QColor color(int ColorIndex) and a void setColor(int ColorIndex, const QColor &v) function. Example 2: @@ -295,7 +300,7 @@ sound_Missile=missile.wav The configuration options will be accessible to the application via -a QString sound(int SoundEvent) and a +a QString sound(int SoundEvent) and a void setSound(int SoundEvent, const QString &v) function. - Parameterized groups
