gentoo resync : 25.10.2021

6 files changed, 173 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index da435a1f8372..a8c443ff947b 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 5d2845c3ef51..4bdbdcfe62d5 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,8 @@
+AUX kio-extras-21.04.3-kio_filenamesearch-crash.patch 1507 BLAKE2B e6472583bdc2818fda320073d70c20117d1242457ae7bf229cf41c2437576fd79bd798fb4046e91269029ce664e073f8778cbf1ccd1b43f15d5fc49066ba0f62 SHA512 7cf8f5713e3023f5923db0907fb2f47570be9eadded5ba4ee40ac8817e4d31e55aa704ec6b34442677cbe34032299746e8f11a39fdefde4e5356121d6d658897
+AUX kio-extras-21.04.3-libmtp-0.1.19.patch 1038 BLAKE2B 28b5b6147a194ecf3af0e11a02868e42cdbf1156e0532e6ea97cdbffd30f55ce04bce4470c89a10cef0b6724f8d43b5f388c54517582513a06a4dcb15a382150 SHA512 1a225a11f90692a91e3034863da32c9ca080c2f4aed2155203a843281496c2df93bf9683117d14c24b18b559a6fd276deef2d05d708d3e425b403060c1b87466
 DIST kio-extras-21.04.3.tar.xz 663328 BLAKE2B a509513732dbacc2f63a162cef49f297b5ee83a1d4bcd436aee474571d4aad8ff5b34710ca23d590b87c9cef8b58add2be507692648e61abc197befc478effb7 SHA512 98cdf33a73b9321c127cb3174f5ffc243e51222c2c4572afc7b51a949a41c85e8758aafaca5db613b11109af693eb6de061d78bcf1138c12fbaebf3b5dc82da9
 DIST kio-extras-21.08.2.tar.xz 627244 BLAKE2B 12d64a7fcad1f64349832fbd26bfd02159cb3e0d36490613cd7e783fb5883051a37ddd6e935bfac914291d9c475e39553ee5d77c9b24c6ebecf2af738429a76c SHA512 0599d8df71af7199cf07cc9e7d94b72078627d140ca862bc16c562d318abddb839d527a92157a8bd6ceec1ad1d720d97178eb588e516acc99d5b853bd0321fa7
 EBUILD kio-extras-21.04.3-r2.ebuild 2709 BLAKE2B fc6450f5f2126ea41c61c41c5ac9350ff21558be3c5458d3977dbef848fdd5b00f65ed64cb9575a76afa21fa66a6bced0e47cc7b8762c28ff3ee0fe2cf1f4671 SHA512 a21f924472095a84ee25647f7aa841b68ae7d024b4c18028079f7bd01e1a8b37f109a66f7f6970e62ad88437f99046c3f46ecad6d49c97ec01cf9e5928f15fe2
-EBUILD kio-extras-21.08.2.ebuild 2637 BLAKE2B 59144dfda88717f72bdafaa4313d4bc7e5b990ed1b46b42f4e336f16fdc8a6b41e66f32c3043fd9e497807fd84c7edd75d2af6c7311c97ffed6a7974067514b3 SHA512 e0df0c4a59aa298cda92ccf2de0d11457e9a03e3d6be1b1ac6afd65ae0feddf3f883a55cf47038ae6554fb8879de1993785287519e9ef7ab191ccb2f9129ef3e
+EBUILD kio-extras-21.04.3-r3.ebuild 2829 BLAKE2B 5198679ea697b281ab6cba31b6e6729771256527bbdc8dbe7f1fce83bdd2358cc1188de2892f12bc44c23ebb3db3bd5b0ab3a7b1d48f0ef6107824214d007abd SHA512 1592b9e594b0195d8e0a7bb07e05620db45516a34ac9fbc43d722ba1c2aeeaa7eb7e24cd8470bebc6721f60c6f39cabcd9540f670d968c8a6c85d6d60a69c34e
+EBUILD kio-extras-21.08.2-r1.ebuild 2723 BLAKE2B df055b564fc7c86df3b87da27b4ba18eb61abf67c1c1e9ca3223c853bff35784c9b31fabcc6b19d3a416267af97405811cd1c9d9133908fedf35fec5ff14e04c SHA512 717007193bd05bcfb4b1bcb82c6a1b2b0074a215dce10ec1d4941edd60559be9e4d9593c43b5e9103059d0294907f34a9faf996d9c700141eef889bd55b8b1b2
 MISC metadata.xml 909 BLAKE2B cdeef268795d77b28472f57e9d6ed422fca8102c9760b2a274557a0af3b279a7844b73041eceb9b63c2f4a8dbc3f20ae51be7706a536c100be8504d213732fd0 SHA512 a2cbfeee2cdf9e8b55cd16b88c834697f4431fe6c1fe3c323c7cc78d9c5968e5bcf9750e11bcc49c2c0f638eb2c69bd7840afb2982515f14e49c9bf0dfaa6ddb
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
new file mode 100644
index 000000000000..dff398e68a25
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
@@ -0,0 +1,36 @@
+From 5dff395ecea2977cf149c293c16c4d4a5151493b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 9 Jul 2021 17:11:02 +0200
+Subject: [PATCH] kio_filenamesearch: fix crash due to KCoreDirLister changes
+
+Error reporting was changed in KCoreDirlister, to match the original behaviour
+we need to explicitly disable auto error handling.
+
+This fixes a crash while searching in Dolphin, kio_filenamesearch intrenally
+uses a dirlister, and a nested event loop, if there is an error while listing
+some dir it tries to report it using a job ui delegate, but the parent job
+could well be dead by that time, which causes a crash:
+"QWidget: Cannot create a QWidget without QApplication"
+
+Note that this crash only happens if KDE_FORK_SLAVES is _not_ set.
+
+BUG: 438187
+---
+ filenamesearch/kio_filenamesearch.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/filenamesearch/kio_filenamesearch.cpp b/filenamesearch/kio_filenamesearch.cpp
+index 4d15aac2..5651a025 100644
+--- a/filenamesearch/kio_filenamesearch.cpp
++++ b/filenamesearch/kio_filenamesearch.cpp
+@@ -102,6 +102,7 @@ void FileNameSearchProtocol::searchDirectory(const QUrl &directory,
+     QScopedPointer<KCoreDirLister> dirLister(new KCoreDirLister);
+     dirLister->setDelayedMimeTypes(true);
+     dirLister->openUrl(directory);
++    dirLister->setAutoErrorHandlingEnabled(false);
+ 
+     QEventLoop eventLoop;
+     QObject::connect(dirLister.data(), static_cast<void(KCoreDirLister::*)()>(&KCoreDirLister::canceled),
+-- 
+GitLab
+
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
new file mode 100644
index 000000000000..400fdd859652
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
@@ -0,0 +1,26 @@
+From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 2 Oct 2021 12:53:27 +0200
+Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19
+
+In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp
+---
+ mtp/kiod_module/mtpdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp
+index 8fe4abb2..f32cd1a4 100644
+--- a/mtp/kiod_module/mtpdevice.cpp
++++ b/mtp/kiod_module/mtpdevice.cpp
+@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device,
+     const char *deviceModel = LIBMTP_Get_Modelname(device);
+ 
+     // prefer friendly devicename over model
+-    if (!deviceName) {
++    if (!deviceName || strlen(deviceName) == 0) {
+         m_friendlyName = QString::fromUtf8(deviceModel);
+     } else {
+         m_friendlyName = QString::fromUtf8(deviceName);
+-- 
+GitLab
+
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
new file mode 100644
index 000000000000..b23dee6554d7
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kactivities-${KFMIN}:5
+		>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	nfs? ( net-libs/libtirpc:= )
+	openexr? ( media-libs/openexr:* )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=
+		net-libs/kdsoap-ws-discovery-client
+	)
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libmtp-0.1.19.patch
+	"${FILESDIR}"/${P}-kio_filenamesearch-crash.patch # bug 817008
+)
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory network
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5ActivitiesStats)
+		$(cmake_use_find_package activities Qt5Sql)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package nfs TIRPC)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package X X11)
+	)
+	use samba && mycmakeargs+=(
+		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-21.08.2.ebuild b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
index abe5cbe7a5b9..79248e2a0404 100644
--- a/kde-apps/kio-extras/kio-extras-21.08.2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
@@ -70,6 +70,10 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="man? ( dev-util/gperf )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.04.3-kio_filenamesearch-crash.patch # bug 817008
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)