Accepting request 346534 from KDE:Frameworks5

1

OBS-URL: https://build.opensuse.org/request/show/346534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=25

kio.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 27 12:47:46 UTC 2015 - wbauer@tmo.at
+
+- Added register-dbus-name-for-kioexec.patch: prevent klauncher
+  from freezing and displaying an error message when opening
+  documents (boo#924764, kde#353037)
+
 -------------------------------------------------------------------
 Sun Nov  8 17:01:28 UTC 2015 - hrvoje.senjan@gmail.com
 

kio.spec

@@ -75,6 +75,8 @@ Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
 Patch0:         kio_help-fallback-to-kde4-docs.patch
+# PATCH-FIX-UPSTREAM register-dbus-name-for-kioexec.patch boo#924764, kde#353037 -- prevent klauncher from freezing and displaying an error message when opening documents
+Patch1:         register-dbus-name-for-kioexec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -121,6 +123,7 @@ Development files.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build

register-dbus-name-for-kioexec.patch

@@ -0,0 +1,45 @@
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Wed, 25 Nov 2015 08:33:47 +0000
+Subject: Register DBus name for kioexec
+X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=1b4289ca0e00bf7ba59b19837ea2b2519f42a984
+---
+Register DBus name for kioexec
+
+KLauncher expects kioexec to register org.kde.kioexec on dbus.
+
+REVIEW: 126164
+BUG: 353037
+FIXED-IN: 5.17.0
+---
+
+
+--- a/src/kioexec/CMakeLists.txt
++++ b/src/kioexec/CMakeLists.txt
+@@ -10,6 +10,7 @@
+     KF5::KIOWidgets    # KRun
+     KF5::WidgetsAddons # KMessageBox
+     KF5::WindowSystem  # KStartupInfo
++    KF5::DBusAddons    # KDBusService
+  )
+ 
+ if (HAVE_X11)
+
+--- a/src/kioexec/main.cpp
++++ b/src/kioexec/main.cpp
+@@ -37,6 +37,7 @@
+ #include <KService>
+ #include <KLocalizedString>
+ #include <KAboutData>
++#include <KDBusService>
+ 
+ #include <QCommandLineParser>
+ #include <QCommandLineOption>
+@@ -282,6 +283,7 @@
+     aboutData.addAuthor(i18n("Waldo Bastian"),QString(), QStringLiteral("bastian@kde.org"));
+     aboutData.addAuthor(i18n("Oswald Buddenhagen"),QString(), QStringLiteral("ossi@kde.org"));
+     KAboutData::setApplicationData(aboutData);
++    KDBusService service(KDBusService::Multiple);
+ 
+     QCommandLineParser parser;
+     parser.addHelpOption();
+