Accepting request 280391 from KDE:Frameworks5

Update to 5.6.0.

OBS-URL: https://build.opensuse.org/request/show/280391
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kinit?expand=0&rev=13

kinit-5.5.0.tar.xz

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

kinit-5.6.0.tar.xz

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

kinit.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan  3 18:03:24 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.6.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.6.0.php
+
 -------------------------------------------------------------------
 Sat Dec  6 12:53:45 UTC 2014 - hrvoje.senjan@gmail.com
 

kinit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kinit
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,11 @@
 
 
 Name:           kinit
-Version:        5.5.0
+Version:        5.6.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 1.5.0
+BuildRequires:  extra-cmake-modules >= 1.6.0
 BuildRequires:  fdupes
 BuildRequires:  kcrash-devel >= %{kf5_version}
 BuildRequires:  kdoctools-devel >= %{kf5_version}
@@ -42,7 +42,7 @@ Summary:        Helper library to speed up start of applications on KDE workspac
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org
-Source:         http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz
+Source:         http://download.kde.org/stable/frameworks/5.6/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE more_verbose.patch -- add more usefull verbosity to kdeinit5 and klauncher
 Patch0:         more_verbose.patch

more_verbose.patch

@@ -1,5 +1,5 @@
 diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 296ebfd..dedbc9c 100644
+index 3c3c913..0a59d38 100644
 --- a/src/kdeinit/kinit.cpp
 +++ b/src/kdeinit/kinit.cpp
 @@ -448,7 +448,7 @@ static void reset_oom_protect()
@@ -206,7 +206,7 @@ index 296ebfd..dedbc9c 100644
  #endif
          }
 diff --git a/src/klauncher/klauncher.cpp b/src/klauncher/klauncher.cpp
-index 31498e0..fbcb064 100644
+index 1b43293..00241e1 100644
 --- a/src/klauncher/klauncher.cpp
 +++ b/src/klauncher/klauncher.cpp
 @@ -65,7 +65,7 @@
@@ -216,76 +216,14 @@ index 31498e0..fbcb064 100644
 -// #define KLAUNCHER_VERBOSE_OUTPUT
 +#define KLAUNCHER_VERBOSE_OUTPUT
  
- static const char *const s_DBusStartupTypeToString[] =
+ #include <QLoggingCategory>
- { "DBusNone", "DBusUnique", "DBusMulti", "ERROR" };
+ Q_DECLARE_LOGGING_CATEGORY(KLAUNCHER)
-@@ -617,7 +617,7 @@ KLauncher::requestStart(KLaunchRequest *request)
+@@ -1118,7 +1118,7 @@ KLauncher::requestSlave(const QString &protocol,
-     request_header.arg_length = requestData.length();
- 
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
--    // qDebug() << "Asking kdeinit to start" << request->name << request->arg_list
-+     qDebug() << "Asking kdeinit to start" << request->name << request->arg_list
-             << "cmd=" << commandToString(request_header.cmd);
- #endif
- 
-@@ -782,7 +782,7 @@ KLauncher::start_service(KService::Ptr service, const QStringList &_urls,
-     }
- 
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
--    // qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name
-+    qDebug() << "name=" << request->name << "dbus_name=" << request->dbus_name
-             << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
- #endif
- 
-@@ -957,7 +957,7 @@ KLauncher::slotDequeue()
-         if (request->status != KLaunchRequest::Launching) {
-             // Request handled.
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
--            // qDebug() << "Request handled already";
-+            qDebug() << "Request handled already";
- #endif
-             requestDone(request);
-             continue;
-@@ -1063,8 +1063,8 @@ KLauncher::requestSlave(const QString &protocol,
-     QString name = slaveModulePath;
- #endif
- 
--    // qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol
--    // << " args=" << arg_list << endl;
-+    qDebug() << "KLauncher: launching new slave " << name << " with protocol=" << protocol
-+     << " args=" << arg_list << endl;
- 
- #ifdef Q_OS_UNIX
- #ifndef USE_KPROCESS_FOR_KIOSLAVES
-@@ -1104,7 +1104,7 @@ KLauncher::requestSlave(const QString &protocol,
      requestStart(request);
      pid_t pid = request->pid;
  
--//    qDebug() << "Slave launched, pid = " << pid;
+-//    qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid;
-+    qDebug() << "Slave launched, pid = " << pid;
++    qCDebug(KLAUNCHER) << "Slave launched, pid = " << pid;
  
      // We don't care about this request any longer....
      requestDone(request);
-@@ -1208,7 +1208,7 @@ KLauncher::slotGotOutput()
- #ifdef USE_KPROCESS_FOR_KIOSLAVES
-     QProcess *p = static_cast<QProcess *>(sender());
-     QByteArray _stdout = p->readAllStandardOutput();
--    // qDebug() << _stdout.data();
-+    qDebug() << _stdout.data();
- #endif
- }
- 
-@@ -1217,12 +1217,12 @@ KLauncher::slotFinished(int exitCode, QProcess::ExitStatus exitStatus)
- {
- #ifdef USE_KPROCESS_FOR_KIOSLAVES
-     QProcess *p = static_cast<QProcess *>(sender());
--    // qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus;
-+    qDebug() << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus;
- 
-     foreach (KLaunchRequest *request, requestList) {
-         if (request->process == p) {
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
--            // qDebug() << "found KProcess, request done";
-+            qDebug() << "found KProcess, request done";
- #endif
-             if (exitCode == 0  && exitStatus == QProcess::NormalExit) {
-                 request->status = KLaunchRequest::Done;