KDE Frameworks 5.89.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=348
This commit is contained in:
Christophe Giboudeaux 2021-12-10 16:06:17 +00:00 committed by Git OBS Bridge
parent 62b46429a0
commit 0a2b906957
7 changed files with 45 additions and 106 deletions

View File

@ -1,88 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffd4aa4277ce545a50ee01783eeb92ca060094fc582c1affd8186c9df0d4a66c
size 3247924

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmGGjk0ACgkQWNDuZIpI
s7ttGAf7Bo+8CqRd241ULUqG9Etoz5KfTEw0yvpZJUpQMucfd/vMOJfn+aaGmUED
FRXEuVxieo1sy+fnq7Glv7zpmT7vsyOhZsNca/y8LrQ3zQWPyqG+pYe/nplG2jWN
vLrDt0NAHjvNkKB7LSveI1hwzCCcK0oeq8dw/DGZV8LSlBjPFziGnnexWyxfFNae
eM1mCZi25AsAQ4e3IDwlH3C4n3BORLcPCB8Mg029Qb6tUONgdHURCGy+Zvebj3TZ
vK7x0UDe+WH66inGgfOzd1wGGjKWsgbQbAN3eKwJiBXj4E3DJysePqPhj9tVRWBH
1oma2z1ZsxP0MkYdozW1KxxKo8/7OA==
=fOM2
-----END PGP SIGNATURE-----

3
kio-5.89.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:025400cb84e9405a1e1638b72084a4f08c59b1827b99602a36c07a5704ff685a
size 3252476

11
kio-5.89.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmGrwAIACgkQWNDuZIpI
s7tSpQf+NAVpvQI4gvGoKd05JgTEAVulvwI1XIoMjhXlcBzSs2IFVHxdRAQr7/56
E4elUZmRqE0A63FKbJRFiUAjs4Pquv7u94QYgCl1SKWfmpSIX4PCT2qIxQ4cMh50
43OIII+67XaVocEutmdf3K8AIxQ1mGPz/qRMMTikGTa9aK296pqOP22wonEP1bX1
SAkEXUhDea5h2Oz7ENXc92nPfV9pIb8dZMiox1hMddmqMhgPVCFt/vHMHda2mQ/P
KJU/1utBjChu/0+vrKgYqiWZd0aT+e0rXaiJGQE7XXbsJmoiacqwZDW7VGs40ftz
Wol4MPe+hF1WN06GBiedQ9HYZDc+RQ==
=ZFPL
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sat Dec 4 22:56:44 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.89.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/5/5.89.0
- Changes since 5.88.0:
* Add new signals and logic to handle open directories in new windows or tabs
* Fix KRun::runApplication when xdg activation is involved (kde#446272)
* Explicitly remove the event filters in classes managed by a unique_ptr
* [KACLEditWidget] Load list of users/groups on demand
* [KPropertiesDialog] Reuse existing KUser instance
* Do not create thumbnails when it requires to copy the file to /tmp (kde#368104)
* Fix directory thumbnailer loading
* [CopyJob] Emit moving while renaming
* [KPropertiesDialog] Improve presentation of file type configuration
* [KPropertiesDialog] Add extra fields value in correct column
* Allow loading of Thumbnailers using embedded json metadata
* KDirOperator: get the icon sizes from user settings
* [KACLEditWidget] Remove redundancy and add icons to buttons
* [KPropertiesDialog] Use Filelight icon and name from desktop file
* [KPropertiesDialog] Hide time labels in multiple mode
* [KPropertiesDialog] Also hide label_left for timestamps
* Fix copying between different filesystems on Linux < 5.3
* [KDynamicJobTracker] Support KUiServerV2JobTracker
- Drop patch, now upstream:
* 0001-Fix-KRun-runApplication-when-xdg-activation-is-invol.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 2 13:38:22 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de> Thu Dec 2 13:38:22 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -16,14 +16,14 @@
# #
%define _tar_path 5.88 %define _tar_path 5.89
# Full KF5 version (e.g. 5.33.0) # Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}} %{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33) # Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: kio Name: kio
Version: 5.88.0 Version: 5.89.0
Release: 0 Release: 0
Summary: Network transparent access to files and data Summary: Network transparent access to files and data
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -36,8 +36,6 @@ Source2: frameworks.keyring
%endif %endif
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 # 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 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: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem