Bug#928740: unblock: libqtxdg/3.3.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libqtxdg
Avoid freeze for DBusActivatable apps, this is mostly visable for the panel
at startup and applications started from menu, pcmanfm-qt application folder
or lxqt-runner. Without the patch the application in charge is frosen up to
25-30s.
>From 6a5d3c26c583613e5c861ab4fafbb418ce82a138 Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Thu, 9 May 2019 17:57:24 +0200
Subject: [PATCH] Upstream patch: Avoid freeze for DBusActivatable apps
(Closes: #928721)
---
debian/changelog | 6 +
debian/patches/avoid-dbus-freeze.patch | 164 +++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 171 insertions(+)
create mode 100644 debian/patches/avoid-dbus-freeze.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 86b2be2..41a9c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libqtxdg (3.3.1-2) unstable; urgency=medium
+
+ * Upstream patch: Avoid freeze for DBusActivatable apps (Closes: #928721)
+
+ -- Alf Gaida <agaida@siduction.org> Thu, 09 May 2019 17:57:01 +0200
+
libqtxdg (3.3.1-1) unstable; urgency=medium
* Cherry-picked new upstream-release 3.3.1.
diff --git a/debian/patches/avoid-dbus-freeze.patch b/debian/patches/avoid-dbus-freeze.patch
new file mode 100644
index 0000000..e90e67b
--- /dev/null
+++ b/debian/patches/avoid-dbus-freeze.patch
@@ -0,0 +1,164 @@
+From bccc6c4030a601892847e9a1495142a1938d1a58 Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Tue, 9 Apr 2019 12:36:11 +0200
+Subject: [PATCH] xdgdesktopfile: Avoid freeze for DBusActivatable apps
+
+For case when the DBusActivatable application is unresponsive the
+startDetached() can block for a long time (the Qt default 25s DBus
+timeout). Blocking can't be avoided while using QDBusInterface, because
+the object can block directly in its constructor.
+
+So we use the generated interface class and set the timeout for the DBus
+call to 1500ms (can be overridden env variable QTXDG_DBUSACTIVATE_TIMEOUT).
+
+See also: https://bugreports.qt.io/browse/QTBUG-75016
+---
+ src/qtxdg/CMakeLists.txt | 10 +++++
+ .../dbus/org.freedesktop.Application.xml | 25 +++++++++++
+ src/qtxdg/xdgdesktopfile.cpp | 43 ++++++++++++++++---
+ 3 files changed, 72 insertions(+), 6 deletions(-)
+ create mode 100644 src/qtxdg/dbus/org.freedesktop.Application.xml
+
+diff --git a/src/qtxdg/CMakeLists.txt b/src/qtxdg/CMakeLists.txt
+index f75b5a5..60ba48b 100644
+--- a/src/qtxdg/CMakeLists.txt
++++ b/src/qtxdg/CMakeLists.txt
+@@ -1,3 +1,5 @@
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
++
+ set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus)
+
+ set(libqtxdg_PUBLIC_H_FILES
+@@ -50,10 +52,18 @@ set(libqtxdg_CPP_FILES
+ xdgmimetype.cpp
+ )
+
++QT5_ADD_DBUS_INTERFACE(DBUS_INTERFACE_SRCS
++ dbus/org.freedesktop.Application.xml
++ application_interface
++)
++
++set_property(SOURCE ${DBUS_INTERFACE_SRCS} PROPERTY SKIP_AUTOGEN ON)
++
+ add_library(${QTXDGX_LIBRARY_NAME} SHARED
+ ${libqtxdg_PUBLIC_H_FILES}
+ ${libqtxdg_PRIVATE_H_FILES}
+ ${libqtxdg_CPP_FILES}
++ ${DBUS_INTERFACE_SRCS}
+ )
+
+ target_link_libraries(${QTXDGX_LIBRARY_NAME}
+diff --git a/src/qtxdg/dbus/org.freedesktop.Application.xml b/src/qtxdg/dbus/org.freedesktop.Application.xml
+new file mode 100644
+index 0000000..945ba9e
+--- /dev/null
++++ b/src/qtxdg/dbus/org.freedesktop.Application.xml
+@@ -0,0 +1,25 @@
++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
++"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
++<!--
++ Based on https://specifications.freedesktop.org/desktop-entry-spec/1.1/ar01s07.html
++-->
++<node>
++ <interface name='org.freedesktop.Application'>
++ <method name='Activate'>
++ <arg type='a{sv}' name='platform_data' direction='in'/>
++ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
++ </method>
++ <method name='Open'>
++ <arg type='as' name='uris' direction='in'/>
++ <arg type='a{sv}' name='platform_data' direction='in'/>
++ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
++ </method>
++ <method name='ActivateAction'>
++ <arg type='s' name='action_name' direction='in'/>
++ <arg type='av' name='parameter' direction='in'/>
++ <arg type='a{sv}' name='platform_data' direction='in'/>
++ <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
++ </method>
++ </interface>
++</node>
++
+diff --git a/src/qtxdg/xdgdesktopfile.cpp b/src/qtxdg/xdgdesktopfile.cpp
+index c22d57d..5fa7604 100644
+--- a/src/qtxdg/xdgdesktopfile.cpp
++++ b/src/qtxdg/xdgdesktopfile.cpp
+@@ -30,6 +30,7 @@
+ #include "xdgdesktopfile_p.h"
+ #include "xdgdirs.h"
+ #include "xdgicon.h"
++#include "application_interface.h"
+
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -100,6 +101,27 @@ QString &unEscape(QString& str);
+ QString &unEscapeExec(QString& str);
+ void loadMimeCacheDir(const QString& dirName, QHash<QString, QList<XdgDesktopFile*> > & cache);
+
++namespace
++{
++ //! Simple helper for getting timeout for starting of DBus activatable applications
++ class DBusActivateTimeout
++ {
++ private:
++ int mTimeoutMs;
++ DBusActivateTimeout()
++ {
++ bool ok;
++ mTimeoutMs = qgetenv("QTXDG_DBUSACTIVATE_TIMEOUT").toInt(&ok);
++ if (!ok)
++ mTimeoutMs = 1500;
++ }
++ static DBusActivateTimeout msInstance;
++ public:
++ static const DBusActivateTimeout & instance() { return msInstance; }
++ operator int() const { return mTimeoutMs; }
++ };
++ DBusActivateTimeout DBusActivateTimeout::msInstance;
++}
+
+ QString &doEscape(QString& str, const QHash<QChar,QChar> &repl)
+ {
+@@ -533,7 +555,7 @@ bool XdgDesktopFileData::startByDBus(const QString & action, const QStringList&
+ ", assembled DBus object path" << path << "is invalid!";
+ return false;
+ }
+- QDBusInterface app(f.completeBaseName(), path, QLatin1String("org.freedesktop.Application"));
++ org::freedesktop::Application app{f.completeBaseName(), path, QDBusConnection::sessionBus()};
+ //Note: after the QDBusInterface construction, it can *invalid* (has reasonable lastError())
+ // but this can be due to some intermediate DBus call(s) which doesn't need to be fatal and
+ // our next call() can succeed
+@@ -543,19 +565,28 @@ bool XdgDesktopFileData::startByDBus(const QString & action, const QStringList&
+ qWarning().noquote() << "XdgDesktopFileData::startByDBus: invalid interface:" << app.lastError().message()
+ << ", but trying to continue...";
+ }
+- QDBusMessage reply;
++ app.setTimeout(DBusActivateTimeout::instance());
++ QDBusPendingReply<> reply;
+ if (!action.isEmpty())
+ {
+ QList<QVariant> v_urls;
+ for (const auto & url : urls)
+ v_urls.append(url);
+- reply = app.call(QLatin1String("ActivateAction"), action, v_urls, platformData);
++ reply = app.ActivateAction(action, v_urls, platformData);
+ } else if (urls.isEmpty())
+- reply = app.call(QLatin1String("Activate"), platformData);
++ reply = app.Activate(platformData);
+ else
+- reply = app.call(QLatin1String("Open"), urls, platformData);
++ reply = app.Open(urls, platformData);
+
+- return QDBusMessage::ErrorMessage != reply.type();
++ reply.waitForFinished();
++ if (QDBusMessage::ErrorMessage == reply.reply().type())
++ {
++ qWarning().noquote().nospace() << "XdgDesktopFileData::startByDBus(timeout=" << DBusActivateTimeout::instance()
++ << "): failed to start org.freedesktop.Application" << mFileName << ": " << reply.reply();
++ return false;
++ }
++
++ return true;
+ }
+
+ QStringList XdgDesktopFileData::getListValue(const XdgDesktopFile * q, const QString & key, bool tryExtendPrefix) const
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c62ddcb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+avoid-dbus-freeze.patch
--
2.20.1
unblock libqtxdg/3.3.1-2
Thanks Alf
-- System Information:
Debian Release: 10.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.0.14-towo.1-siduction-amd64 (SMP w/8 CPU cores; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8), LANGUAGE= (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
Reply to: