Accepting request 348550 from KDE:Frameworks5

Update to 5.17.0

OBS-URL: https://build.opensuse.org/request/show/348550
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kded?expand=0&rev=24

kded-5.16.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18752b8928f97fba456d8badb1c378a45b24447ed503ac622136cd8492ea155c
-size 35832

kded-5.17.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:134e108fd99e196e4c539848fe5de9a2a39325d77d845b084809831d774b9eea
+size 36000

kded-fix-cmdline-parsing.patch

@@ -1,59 +0,0 @@
-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();
-

kded.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Dec 10 23:04:10 UTC 2015 - hrvoje.senjan@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
+
 -------------------------------------------------------------------
 Sun Nov  8 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com
 

kded.spec

@@ -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 @@ License:        LGPL-2.1+
 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 alarrosa@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 @@ Development files.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %build
   %cmake_kf5 -d build