pool/kio
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 935212 from KDE:Frameworks5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/935212
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2021-12-06 22:59:27 +00:00 committed by Git OBS Bridge
commit fea8b60bdb
3 changed files with 97 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
0001-Fix-KRun-runApplication-when-xdg-activation-is-invol.patch Normal file
View File

@ -0,0 +1,88 @@
From 886700651f4460f11c1cfec61730c75807a87258 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 30 Nov 2021 17:33:18 +0100
Subject: [PATCH] Fix KRun::runApplication when xdg activation is involved
Has waitForStarted account for xdg activation token request.
BUG: 446272
(cherry picked from commit 25f3a6937a80f2748790265b9b688d64126e43d0)
---
src/gui/kprocessrunner.cpp | 13 ++++++++++---
src/gui/kprocessrunner_p.h | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
index 130dade75..82c959afe 100644
--- a/src/gui/kprocessrunner.cpp
+++ b/src/gui/kprocessrunner.cpp
@@ -32,6 +32,7 @@
#include <QProcess>
#include <QStandardPaths>
#include <QString>
+#include <QTimer>
#include <QUuid>
#ifdef Q_OS_WIN
@@ -259,7 +260,6 @@ void KProcessRunner::init(const KService::Ptr &service,
Q_UNUSED(iconName);
#endif
- bool waitingForXdgToken = false;
if (KWindowSystem::isPlatformWayland()) {
if (!asn.isEmpty()) {
m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), QString::fromUtf8(asn));
@@ -274,7 +274,7 @@ void KProcessRunner::init(const KService::Ptr &service,
}
if (window) {
const int launchedSerial = KWindowSystem::lastInputSerial(window);
- waitingForXdgToken = true;
+ m_waitingForXdgToken = true;
connect(this, &KProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
startProcess();
});
@@ -285,6 +285,7 @@ void KProcessRunner::init(const KService::Ptr &service,
if (tokenSerial == launchedSerial) {
m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), token);
Q_EMIT xdgActivationTokenArrived();
+ m_waitingForXdgToken = false;
}
});
KWindowSystem::requestXdgActivationToken(window, launchedSerial, QFileInfo(m_serviceEntryPath).completeBaseName());
@@ -316,7 +317,7 @@ void KProcessRunner::init(const KService::Ptr &service,
m_description = userVisibleName;
}
- if (!waitingForXdgToken) {
+ if (!m_waitingForXdgToken) {
startProcess();
}
}
@@ -331,6 +332,12 @@ void ForkingProcessRunner::startProcess()
bool ForkingProcessRunner::waitForStarted(int timeout)
{
+ if (m_process->state() == QProcess::NotRunning && m_waitingForXdgToken) {
+ QEventLoop loop;
+ QObject::connect(m_process.get(), &QProcess::stateChanged, &loop, &QEventLoop::quit);
+ QTimer::singleShot(timeout, &loop, &QEventLoop::quit);
+ loop.exec();
+ }
return m_process->waitForStarted(timeout);
}
diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
index 1f94df7a2..df6f08f64 100644
--- a/src/gui/kprocessrunner_p.h
+++ b/src/gui/kprocessrunner_p.h
@@ -140,6 +140,7 @@ protected:
qint64 m_pid = 0;
KService::Ptr m_service;
QString m_serviceEntryPath;
+ bool m_waitingForXdgToken = false;
private:
void emitDelayedError(const QString &errorMsg);
--
2.34.0

7
kio.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 2 13:38:22 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix KRun on Wayland (kde#446272,
gh#openSUSE/kmozillahelper#33):
* 0001-Fix-KRun-runApplication-when-xdg-activation-is-invol.patch
-------------------------------------------------------------------
Sun Nov 7 09:13:25 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

2
kio.spec
View File

@ -36,6 +36,8 @@ Source2: frameworks.keyring
%endif
# 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
Patch1: 0001-Fix-KRun-runApplication-when-xdg-activation-is-invol.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem