gentoo auto-resync : 23:03:2023 - 18:45:51

3 files changed, 129 insertions, 0 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 9a28b0928745..e2648140c8c7 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,9 @@
 AUX kio-5.102.0-add-missing-webdav-copyFromFile.patch 1247 BLAKE2B 3a1baff8fed9a4d23cbbfd7dc7492fa89de0135b30029ba5b73e3a62d1b7036762648e72bd6cdef2c0b730799e32d3bb11f72e5a3897633c703ed4893c0d7b9e SHA512 37956a2508a3e6dc9bf03d8e27938a64fd532357bfbf41d1f1727e1988dda01160a3891c8a82424ad9f19ea0502f0c80020a085d5fc59b3e6e15555c12ccb62a
+AUX kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch 1415 BLAKE2B dd13229fa76bfb4edd8c2ca62f4538c0d91035b28470642188b2f91f221f5df00c5760426e5b19a5d4c5a8d3d59b8f35930a3b1646c415b505bb51b0261868f2 SHA512 ae530487705ee16ce19664864b3bdd2cd81f66ed6907523c7a8c665c2c1e2ef62f35d52fb1c1c99b162863f9cd3bf82c3771fad82b10a552eaa2c383b6901b56
 AUX kio-5.104.0-renamefiledialog-fix-number-limit.patch 1112 BLAKE2B ee1a4249fc347644465a40c3ed001b0f212ffc96b1b7af4921cf885b94eef40eeefcb714be8443991f67cf4a3e906eeef1e62f633a67e76ff6af5a2a4004805a SHA512 471c2439bcc74f3e74cd80deb58913d083314c61ffff28f35a36e0a2a603d7d1bd0c4d9fc2200b2d724f6073367c064152e7ac62ac80aa7fcc7a20512f19eb9b
 DIST kio-5.102.0.tar.xz 3769416 BLAKE2B 432acbd7844539e7c2617ea5743449b7da4377235485644ab9066919ee7c4746388deb116ee6664c52bcefa35c54bda3dfcc6f2f58a03a1638fe6173e5a99330 SHA512 29f46ace3a902a24c3a266413b291eac43bcfc5da76dfbc927f3d0e36c3902f0abf195b0cd97fd163a62b85a3d0bbb006dc73bc0fc43a88e47f72e7991536dc4
 DIST kio-5.104.0.tar.xz 3770264 BLAKE2B 5633873828eafbfc1438d898c7eee7cc4234d0612b636d9b086ec273527900a0f9cc5fb3aeac327c2d0a96ec00192377e27f44bb300c6e7209876826b77a9b22 SHA512 483edb57a9de8be37248b4bdbd442d55814e126348d6db8316c9bcd59be76620d44145760e31ba685ce3ae606451547c3c386f8049b47df1b7f4ef2f45c276b8
 EBUILD kio-5.102.0-r1.ebuild 2435 BLAKE2B d30f8252fa6264f151844225512745cf39e3231c8ac2efd8a4185207b03b805ddbcadbeefc145de3842d4eac26ccc2f40bd9af31a660901dd78fd724c128bb22 SHA512 25757c6f692b89745d0b3b43c30d5f5c8d75cc09fcca71d6d3af6e46861606bc7417c77dd94b4111f37da969b89f4c31bf22c03975bccf7e4af15d2c4b807b92
 EBUILD kio-5.104.0-r1.ebuild 2440 BLAKE2B a6c334414667af173643d4fbd554589664433c8d8230d859d0ce393d56aad9d7b3ce2d05c66b5f07cdfc65e4026ef4f073285e8a39295d323e5515637d4be722 SHA512 7ae82d3b2d1c1f296b35b0274c31710ea8f40477804bd62415fa30c8bc6df2efc4a579d2d76dd3b7c7647b1b9bf938ddfd10d8beb265ebc380293900d30a31ce
+EBUILD kio-5.104.0-r2.ebuild 2520 BLAKE2B adc3f40ea484253cfed5f858b5e39a5a171d76dd8507d020356e13c63517d582be9a407c7a140de0f951e16e1a317ab6d6aede0c37716d975f5a38c73bb3a534 SHA512 04fca40b22951902577997687f8caba86424dd727a9bfb30778ffd6c30d7808ac92715905e3a3e37d94b6a085cdc625899f78fa12c346120ee0d705884198498
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
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
new file mode 100644
index 000000000000..ae10923bb774
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch
@@ -0,0 +1,33 @@
+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/kio-5.104.0-r2.ebuild b/kde-frameworks/kio/kio-5.104.0-r2.ebuild
new file mode 100644
index 000000000000..4734831d6e8a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.104.0-r2.ebuild
@@ -0,0 +1,94 @@
+# 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
+)
+
+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
+}