[SCM] KDE Discover packaging branch, master, updated. debian/5.8.5-2-5-g4f40d4b

Matthias Klumpp mak at moszumanska.debian.org
Fri Jan 20 20:11:42 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=40ccbfa

The following commit has been merged in the master branch:
commit 40ccbfa2b83f096fe3264ae4c23ecbbbd0c6a83c
Author: Matthias Klumpp <mak at debian.org>
Date:   Fri Jan 20 21:04:06 2017 +0100

    fix-desktop-run.patch: Fix arguments when running .desktop files with runservice
---
 debian/patches/01_fix-desktop-run.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/01_fix-desktop-run.patch b/debian/patches/01_fix-desktop-run.patch
new file mode 100644
index 0000000..79da348
--- /dev/null
+++ b/debian/patches/01_fix-desktop-run.patch
@@ -0,0 +1,27 @@
+From 2db9081b379614ecc19331634d31ca827b9cf9e6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian at ritter-vogt.de>
+Date: Tue, 27 Dec 2016 18:53:40 +0100
+Subject: Fix arguments when running .desktop files with runservice
+
+Without this patch the command run with runservice has a duplicate first argument
+as QProcess already prepends the executable name.
+---
+ libdiscover/backends/PackageKitBackend/runservice/main.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdiscover/backends/PackageKitBackend/runservice/main.cpp b/libdiscover/backends/PackageKitBackend/runservice/main.cpp
+index b56917a..693d80c 100644
+--- a/libdiscover/backends/PackageKitBackend/runservice/main.cpp
++++ b/libdiscover/backends/PackageKitBackend/runservice/main.cpp
+@@ -39,5 +39,7 @@ int main(int argc, char** argv)
+     QTextStream cerr(stderr);
+     KIO::DesktopExecParser execParser(_service, {});
+ 
+-    return !QProcess::startDetached(KIO::DesktopExecParser::executableName(_service.exec()), execParser.resultingArguments());
++    auto args = execParser.resultingArguments();
++    const auto execName = args.takeFirst();
++    return !QProcess::startDetached(execName, args);
+ }
+-- 
+cgit v0.11.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f992216
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-desktop-run.patch

-- 
KDE Discover packaging



More information about the pkg-kde-commits mailing list