commit: a61d404f0f2f976a648be4bc6a3c872f7a71f1a4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun May 30 15:38:44 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 30 15:51:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61d404f
kde-frameworks/kio: filenamesearch crashes in KCoreDirLister Upstream commit a38fcf356de0cbba1ce97c8ef70979ed897a8094 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437153 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kio-5.82.0-fix-filenamesearch-crashes.patch | 28 ++++++ kde-frameworks/kio/kio-5.82.0-r2.ebuild | 111 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch new file mode 100644 index 00000000000..b92139a5187 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch @@ -0,0 +1,28 @@ +From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik <[email protected]> +Date: Tue, 18 May 2021 19:54:54 +0200 +Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null + +BUG: 437153 +--- + src/core/kcoredirlister.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp +index a836f0aa..58d8791c 100644 +--- a/src/core/kcoredirlister.cpp ++++ b/src/core/kcoredirlister.cpp +@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j) + Q_EMIT kdl->jobError(job); + if (kdl->d->m_autoErrorHandling && !errorShown) { + errorShown = true; // do it only once +- job->uiDelegate()->showErrorMessage(); ++ if (job->uiDelegate()) { ++ job->uiDelegate()->showErrorMessage(); ++ } + } + #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82) + kdl->handleError(job); +-- +2.31.1 + diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild new file mode 100644 index 00000000000..79d4c76e5a5 --- /dev/null +++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org xdg-utils + +DESCRIPTION="Framework providing transparent file and data management" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 + =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 ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + ) +" +PDEPEND=" + >=kde-frameworks/kded-${PVCUT}:5 +" + +PATCHES=( + # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 + "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971 + # upstream backport request - see also KDE-bug 398908 + "${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch + "${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153 + # git master/KIO 5.83: + "${FILESDIR}"/${P}-no-useragent-kcm.patch + "${FILESDIR}"/${P}-no-cache-kcm.patch +) + +src_prepare() { + ecm_src_prepare + rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package acl ACL) + $(cmake_use_find_package handbook KF5DocTools) + $(cmake_use_find_package kerberos GSSAPI) + $(cmake_use_find_package kwallet KF5Wallet) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +}
