diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /kde-frameworks/kio/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r-- | kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch | 87 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch | 28 |
2 files changed, 0 insertions, 115 deletions
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch deleted file mode 100644 index 0d3bf2aeca3a..000000000000 --- a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 25f3a6937a80f2748790265b9b688d64126e43d0 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 ---- - 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); --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch deleted file mode 100644 index a6a4877cf0f4..000000000000 --- a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch +++ /dev/null @@ -1,28 +0,0 @@ -From aef544ebbb11e842209f3b071eaa9d1c2f26fa40 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Wed, 17 Nov 2021 23:45:17 +0100 -Subject: [PATCH] Fix copying between different filesystems on Linux < 5.3 - -From the copy_file_range manpage - -EXDEV The files referred to by fd_in and fd_out are not on the same mounted filesystem (pre Linux 5.3). ---- - src/ioslaves/file/file_unix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp -index b4eca2ae9..02b5dc14c 100644 ---- a/src/ioslaves/file/file_unix.cpp -+++ b/src/ioslaves/file/file_unix.cpp -@@ -813,7 +813,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF - const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0); - - if (copiedBytes == -1) { -- if (errno == EINVAL) { -+ if (errno == EINVAL || errno == EXDEV) { - break; // will continue with next copy mechanism - } - --- -GitLab - |