Hello community,
here is the log from the commit of package kio for openSUSE:Factory checked in
at 2015-12-09 19:41:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio (Old)
and /work/SRC/openSUSE:Factory/.kio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kio/kio.changes 2015-11-24 22:23:58.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2015-12-09
19:41:14.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 27 12:47:46 UTC 2015 - wba...@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)
+
+-------------------------------------------------------------------
New:
----
register-dbus-name-for-kioexec.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio.spec ++++++
--- /var/tmp/diff_new_pack.Q5L4Oq/_old 2015-12-09 19:41:16.000000000 +0100
+++ /var/tmp/diff_new_pack.Q5L4Oq/_new 2015-12-09 19:41:16.000000000 +0100
@@ -75,6 +75,8 @@
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 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ register-dbus-name-for-kioexec.patch ++++++
From: Weng Xuetian <wen...@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("bast...@kde.org"));
aboutData.addAuthor(i18n("Oswald Buddenhagen"),QString(),
QStringLiteral("o...@kde.org"));
KAboutData::setApplicationData(aboutData);
+ KDBusService service(KDBusService::Multiple);
QCommandLineParser parser;
parser.addHelpOption();
