Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2015-12-29 12:51:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2015-11-24 22:22:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2015-12-29 12:51:45.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Dec 10 23:04:10 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.17.0 + * Unset SESSION_MANAGER envvar instead of setting it empty + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.17.0.php +- Drop upstreamed kded-fix-cmdline-parsing.patch + +------------------------------------------------------------------- Old: ---- kded-5.16.0.tar.xz kded-fix-cmdline-parsing.patch New: ---- kded-5.17.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.NWuVar/_old 2015-12-29 12:51:46.000000000 +0100 +++ /var/tmp/diff_new_pack.NWuVar/_new 2015-12-29 12:51:46.000000000 +0100 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.16 +%define _tar_path 5.17 Name: kded -Version: 5.16.0 +Version: 5.17.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -48,8 +48,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE kded-fix-cmdline-parsing.patch alarr...@suse.com -- Removes a warning and fixes command line parsing -Patch0: kded-fix-cmdline-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,7 +68,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ kded-5.16.0.tar.xz -> kded-5.17.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.16.0/CMakeLists.txt new/kded-5.17.0/CMakeLists.txt --- old/kded-5.16.0/CMakeLists.txt 2015-11-08 13:15:35.000000000 +0100 +++ new/kded-5.17.0/CMakeLists.txt 2015-12-06 22:21:53.000000000 +0100 @@ -3,7 +3,7 @@ project(KDED) include(FeatureSummary) -find_package(ECM 5.16.0 NO_MODULE) +find_package(ECM 5.17.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) @@ -16,8 +16,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.16.0") # handled by release scripts -set(KF5_DEP_VERSION "5.16.0") # handled by release scripts +set(KF5_VERSION "5.17.0") # handled by release scripts +set(KF5_DEP_VERSION "5.17.0") # handled by release scripts find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.16.0/src/kded.cpp new/kded-5.17.0/src/kded.cpp --- old/kded-5.16.0/src/kded.cpp 2015-11-08 13:15:35.000000000 +0100 +++ new/kded-5.17.0/src/kded.cpp 2015-12-06 22:21:53.000000000 +0100 @@ -30,6 +30,7 @@ #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QTimer> +#include <QtCore/QCommandLineParser> #include <QApplication> #include <QDBusConnection> @@ -46,7 +47,7 @@ #include <KPluginInfo> #include <KPluginMetaData> -Q_DECLARE_LOGGING_CATEGORY(KDED); +Q_DECLARE_LOGGING_CATEGORY(KDED) #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) // logging category for this framework, default: log stuff >= warning @@ -668,10 +669,12 @@ QStandardPaths::enableTestMode(true); } -static void setupAppInfo(QCoreApplication *app) +static void setupAppInfo(QApplication *app) { app->setApplicationName("kded5"); + app->setApplicationDisplayName("KDE Daemon"); app->setOrganizationDomain("kde.org"); + app->setApplicationVersion(KDED_VERSION_STRING); } extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) @@ -679,24 +682,30 @@ //options.add("check", qi18n("Check Sycoca database only once")); // WABA: Make sure not to enable session management. - putenv(qstrdup("SESSION_MANAGER=")); + qunsetenv("SESSION_MANAGER"); + + // In older versions, QApplication creation was postponed until after + // testing for --check, in which case, only a QCoreApplication was created. + // Since that option is no longer used at startup, we removed that speed + // optimization for code clarity and easier support of standard parameters. + QApplication app(argc, argv); + setupAppInfo(&app); + app.setQuitOnLastWindowClosed(false); + + QCommandLineParser parser; + parser.addHelpOption(); + parser.addVersionOption(); + parser.addOption(QCommandLineOption(QStringLiteral("check"), QStringLiteral("Check cache validity"))); + parser.process(app); // Parse command line before checking D-Bus - if (argc > 1 && QByteArray(argv[1]) == "--check") { + if (parser.isSet(QStringLiteral("check"))) { // KDBusService not wanted here. - QCoreApplication app(argc, argv); - setupAppInfo(&app); - KSycoca::self()->ensureCacheValid(); runKonfUpdate(); return 0; } - QApplication app(argc, argv); - setupAppInfo(&app); - app.setApplicationDisplayName("KDE Daemon"); - app.setQuitOnLastWindowClosed(false); - KDBusService service(KDBusService::Unique); KSharedConfig::Ptr config = KSharedConfig::openConfig();
