diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-23 01:23:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-23 01:23:10 +0100 |
commit | 7828eef5de9e45f50282e2b1eaf348f1ac7af477 (patch) | |
tree | ea872a4f1afc4b28699120de310c5d87b75ea5d0 /kde-frameworks/kio/files | |
parent | cd18653acd5ce929bb0ec77dde842439db6f060c (diff) |
gentoo auto-resync : 23:06:2023 - 01:23:10
Diffstat (limited to 'kde-frameworks/kio/files')
3 files changed, 0 insertions, 142 deletions
diff --git a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch deleted file mode 100644 index 53df9fcc0a62..000000000000 --- a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fea052ba369e474a092516a4717556b52ff92e00 Mon Sep 17 00:00:00 2001 -From: Thenujan Sandramohan <sthenujan2002@gmail.com> -Date: Fri, 24 Mar 2023 22:33:19 +0000 -Subject: [PATCH] CommandLauncher: call emitResult() as soon as process has - started - -This MR makes `emitResult` get called as soon as the process has started instead of when the process has ended. It also changes `emitDelayedError` as a protected member of `KProcessRunner` to make it invokable by `ForkingProcessRunner`. It also removes `processFinished` signal as it's not used anymore. - -BUG: 466359 ---- - src/gui/commandlauncherjob.cpp | 2 -- - src/gui/kprocessrunner.cpp | 3 +-- - src/gui/kprocessrunner_p.h | 7 +------ - 3 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/src/gui/commandlauncherjob.cpp b/src/gui/commandlauncherjob.cpp -index c82a8ef56e..06deede116 100644 ---- a/src/gui/commandlauncherjob.cpp -+++ b/src/gui/commandlauncherjob.cpp -@@ -143,8 +143,6 @@ void KIO::CommandLauncherJob::start() - }); - connect(d->m_processRunner, &KProcessRunner::processStarted, this, [this](qint64 pid) { - d->m_pid = pid; -- }); -- connect(d->m_processRunner, &KProcessRunner::processFinished, this, [this]() { - emitResult(); - }); - } -diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp -index 232b0e4caa..b97079c240 100644 ---- a/src/gui/kprocessrunner.cpp -+++ b/src/gui/kprocessrunner.cpp -@@ -472,9 +472,8 @@ void ForkingProcessRunner::slotProcessExited(int exitCode, QProcess::ExitStatus - if (exitCode == 9009) { - #endif - const QStringList args = m_cmd.split(QLatin1Char(' ')); -- Q_EMIT error(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0])); -+ emitDelayedError(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0])); - } -- Q_EMIT processFinished(); - } - - // This code is also used in klauncher (and KRun). -diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h -index 84973547c6..65df04b073 100644 ---- a/src/gui/kprocessrunner_p.h -+++ b/src/gui/kprocessrunner_p.h -@@ -120,11 +120,6 @@ Q_SIGNALS: - */ - void processStarted(qint64 pid); - -- /** -- * @brief emitted when the process was finished -- */ -- void processFinished(); -- - /** - * Notifies about having received the token were waiting for. - * -@@ -142,6 +137,7 @@ protected: - QString name() const; - QString maybeAliasedName(const QString &pattern) const; - static QString escapeUnitName(const QString &input); -+ void emitDelayedError(const QString &errorMsg); - - std::unique_ptr<KProcess> m_process; - QString m_executable; // can be a full path -@@ -157,7 +153,6 @@ protected: - KStartupInfoId m_startupId; - - private: -- void emitDelayedError(const QString &errorMsg); - void initFromDesktopName(const QString &desktopName, - const QString &execName, - const QString &iconName, --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch b/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch deleted file mode 100644 index ae10923bb774..000000000000 --- a/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 05dee56f45dae37745f21a95e19a149b69e719e3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Mon, 27 Feb 2023 09:30:05 +0100 -Subject: [PATCH] Also handle copy_file_range failing with ENOENT - -There appears to be a kernel bug (?) that CIFS fails with ENOENT on -copy_file_range. - -coreutils had to work around this as well, see the included link. - -(cherry picked from commit 00840d05abd875e1901b655ed6af3bc76ef48433) ---- - src/ioslaves/file/file_unix.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp -index 1865b852d9..8d005daf81 100644 ---- a/src/ioslaves/file/file_unix.cpp -+++ b/src/ioslaves/file/file_unix.cpp -@@ -822,7 +822,9 @@ 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 || errno == EXDEV) { -+ // ENOENT is returned on cifs in some cases, probably a kernel bug -+ // (s.a. https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c) -+ if (errno == EINVAL || errno == EXDEV || errno == ENOENT) { - break; // will continue with next copy mechanism - } - --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch b/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch deleted file mode 100644 index dfdf851e065e..000000000000 --- a/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d8e4f575e4967a2303812529a866b89ad2fe26f5 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Tue, 7 Mar 2023 23:43:21 +0100 -Subject: [PATCH] widgets/renamefiledialog: set number limit again - -Not setting a maximum makes it default to 99, which is not what we want. -Instead, set it to a billion, which should be enough for everyone - -BUG: 466636 - - -(cherry picked from commit 04e31155574939dc0be2078b5f17c36791ef57e5) ---- - src/widgets/renamefiledialog.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/widgets/renamefiledialog.cpp b/src/widgets/renamefiledialog.cpp -index ad6eafbaa0..ceb0748755 100644 ---- a/src/widgets/renamefiledialog.cpp -+++ b/src/widgets/renamefiledialog.cpp -@@ -132,6 +132,7 @@ RenameFileDialog::RenameFileDialog(const KFileItemList &items, QWidget *parent) - mainLayout->addWidget(infoLabel); - d->spinBox = new QSpinBox(page); - d->spinBox->setMinimum(0); -+ d->spinBox->setMaximum(1'000'000'000); - d->spinBox->setSingleStep(1); - d->spinBox->setValue(1); - d->spinBox->setDisplayIntegerBase(10); --- -GitLab - |