[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     cca54926437d76292328419ebc5659b183a1640e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 20:42:06 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 21:16:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca54926

kde-frameworks/kio: drop 5.104.0-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kio/Manifest                        |  1 -
 .../kio-5.104.0-fix-kstart5-not-returning.patch    | 78 ------------------
 ...0-handle-copy_file_range-failing-w-ENOENT.patch | 33 --------
 ...5.104.0-renamefiledialog-fix-number-limit.patch | 31 -------
 kde-frameworks/kio/kio-5.104.0-r3.ebuild           | 95 ----------------------
 5 files changed, 238 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index dea1e5c12ba3..252988842c2b 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.104.0.tar.xz 3770264 BLAKE2B 5633873828eafbfc1438d898c7eee7cc4234d0612b636d9b086ec273527900a0f9cc5fb3aeac327c2d0a96ec00192377e27f44bb300c6e7209876826b77a9b22 SHA512 483edb57a9de8be37248b4bdbd442d55814e126348d6db8316c9bcd59be76620d44145760e31ba685ce3ae606451547c3c386f8049b47df1b7f4ef2f45c276b8
 DIST kio-5.106.0.tar.xz 3771496 BLAKE2B 46cb4ab6b6ec83efdd9fa9a4c988d25517462efb9f70a258cccb5c2c8ee197083cdd881a7393251487091d88d86580173d7f1a9af12347e707cdcbb864ed0cfd SHA512 d4996f5bc4e69ebab4ca49944c820c54998a0c25995f14f4f27e8d6967e0274ae02e248c75a8b3315cd77b10ce93b36c3825da2de832349f5a2abd067eae6b92
 DIST kio-5.107.0.tar.xz 3771692 BLAKE2B d0528bf0b14ece9505d9c15b302415eea4384bd143b7963cf3ef475ccb1789ca3d1c8ada2047d964dbbf2d965e20dcd6d9509c8147beefa4f4b95d140a4f5731 SHA512 184b7eea95f72302a81f799e683228ebb6814d9fe6ca515f9db3a911fc773366aec0550bfc904e7c011977d6b577a7c2bbeab3c3bfeabf0fee54f72b2e12c222

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
-

diff --git a/kde-frameworks/kio/kio-5.104.0-r3.ebuild b/kde-frameworks/kio/kio-5.104.0-r3.ebuild
deleted file mode 100644
index 30caf8f78229..000000000000
--- a/kde-frameworks/kio/kio-5.104.0-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-renamefiledialog-fix-number-limit.patch" # KDE-bug 466636
-	"${FILESDIR}/${P}-handle-copy_file_range-failing-w-ENOENT.patch" # bug 885793
-	"${FILESDIR}/${P}-fix-kstart5-not-returning.patch" # KDE-bug 466359
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}