Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2015-11-11 10:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-19 22:23:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2015-11-11 10:28:39.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Oct 23 17:50:20 UTC 2015 - alarr...@suse.com + +- Removes a Qt warning related to session management, add + --version and --help command line options and make kded parse + the commandline correctly. + * kded-fix-cmdline-parsing.patch + +------------------------------------------------------------------- New: ---- kded-fix-cmdline-parsing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.mXC2gG/_old 2015-11-11 10:28:40.000000000 +0100 +++ /var/tmp/diff_new_pack.mXC2gG/_new 2015-11-11 10:28:40.000000000 +0100 @@ -48,6 +48,8 @@ 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 @@ -68,6 +70,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ kded-fix-cmdline-parsing.patch ++++++ diff --git a/src/kded.cpp b/src/kded.cpp index 6929d7d3f24d3556f1b227d5a9bfb5b02b1c295e..082d3863dcf484a6d609e2c639c49788d9576007 100644 --- a/src/kded.cpp +++ b/src/kded.cpp @@ -30,6 +30,7 @@ #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QTimer> +#include <QtCore/QCommandLineParser> #include <QApplication> #include <QDBusConnection> @@ -672,6 +673,7 @@ static void setupAppInfo(QCoreApplication *app) { app->setApplicationName("kded5"); app->setOrganizationDomain("kde.org"); + app->setApplicationVersion(KDED_VERSION_STRING); } extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) @@ -679,24 +681,27 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) //options.add("check", qi18n("Check Sycoca database only once")); // WABA: Make sure not to enable session management. - putenv(qstrdup("SESSION_MANAGER=")); + qunsetenv("SESSION_MANAGER"); + + QApplication app(argc, argv); + app.setApplicationDisplayName("KDE Daemon"); + 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();
