libqtxdg: update to 2.0.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-09-26 22:12:32 +02:00
parent a1aec4f565
commit 475def35bd
2 changed files with 2 additions and 58 deletions

View File

@@ -1,55 +0,0 @@
From 242089585196bab92cb7d0ff04b1cc6926d7d43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 18 Jan 2016 21:08:22 +0100
Subject: [PATCH] xdgdesktopfile: handle 'Path' entry for working directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
it is an optional enty of the specification [1]
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
Upstream-Status: Submitted [2]
[2] https://github.com/lxde/libqtxdg/pull/69
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
xdgdesktopfile.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/xdgdesktopfile.cpp b/xdgdesktopfile.cpp
index 75a80bf..61c4449 100644
--- a/xdgdesktopfile.cpp
+++ b/xdgdesktopfile.cpp
@@ -383,12 +383,17 @@ bool XdgDesktopFileData::startApplicationDetached(const XdgDesktopFile *q, const
}
QString cmd = args.takeFirst();
+ QString workingDir = q->value("Path").toString();
+ if (!workingDir.isEmpty() && !QDir(workingDir).exists())
+ workingDir = QString();
if (nonDetach)
{
QScopedPointer<QProcess> p(new QProcess);
p->setStandardInputFile(QProcess::nullDevice());
p->setProcessChannelMode(QProcess::ForwardedChannels);
+ if (!workingDir.isEmpty())
+ p->setWorkingDirectory(workingDir);
p->start(cmd, args);
bool started = p->waitForStarted();
if (started)
@@ -400,7 +405,7 @@ bool XdgDesktopFileData::startApplicationDetached(const XdgDesktopFile *q, const
}
else
{
- return QProcess::startDetached(cmd, args);
+ return QProcess::startDetached(cmd, args, workingDir);
}
}
--
2.5.0

View File

@@ -7,6 +7,5 @@ inherit lxqt
# libmagic is supplied by file
DEPENDS += "file"
SRC_URI += "file://0001-xdgdesktopfile-handle-Path-entry-for-working-directo.patch"
SRCREV = "b65a324bcd2fc498f8a01eb56dfb54ae05e9b0b2"
PV = "1.3.0"
SRCREV = "fc6b455a7ede30a4b3db73c2af06dfa44af585ea"
PV = "2.0.0"