commit: 35ba1aee75ef4f7aa7cffb17968c1fe46adac58d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 19 13:26:00 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 19 13:29:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ba1aee
kde-frameworks/kio: Fix crash in DropJob KDE-bug: https://bugs.kde.org/show_bug.cgi?id=454747 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kio-5.96.0-fix-crash-in-dropjob.patch | 45 ++++++++++ kde-frameworks/kio/kio-5.96.0-r1.ebuild | 96 ++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch new file mode 100644 index 000000000000..638a03f6eb98 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch @@ -0,0 +1,45 @@ +From 29bdf541aa83c78bc8e9d90487a7e1dd505ef013 Mon Sep 17 00:00:00 2001 +From: David Edmundson <k...@davidedmundson.co.uk> +Date: Fri, 8 Jul 2022 15:46:11 +0100 +Subject: [PATCH] Fix crash in DropJob + +QMimeData is owned by the backend and can be deleted during any event +processing. + +DropJob has a deferred start operation. One path in this is to call +PasteJob with mimedata. It could be dangling by this point. + +Pastejob follows a similar pattern in +1d668a9fe65c5bc178487fc32e6662ff815147f6 internally but we also need to +handle this usage before PasteJob. + +BUG: 454747 +--- + src/widgets/dropjob.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp +index fa2bf4ccc..5af578d28 100644 +--- a/src/widgets/dropjob.cpp ++++ b/src/widgets/dropjob.cpp +@@ -139,7 +139,7 @@ public: + void addPluginActions(KIO::DropMenu *popup, const KFileItemListProperties &itemProps); + void doCopyToDirectory(); + +- const QMimeData *m_mimeData; ++ QPointer<const QMimeData> m_mimeData; + const QList<QUrl> m_urls; + QMap<QString, QString> m_metaData; + Qt::DropAction m_dropAction; +@@ -271,7 +271,7 @@ void DropJobPrivate::slotStart() + q->emitResult(); + } + } +- } else { ++ } else if (m_mimeData) { + // Dropping raw data + KIO::PasteJob *job = KIO::PasteJobPrivate::newJob(m_mimeData, m_destUrl, KIO::HideProgressInfo, false /*not clipboard*/); + QObject::connect(job, &KIO::PasteJob::itemCreated, q, &KIO::DropJob::itemCreated); +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.96.0-r1.ebuild b/kde-frameworks/kio/kio-5.96.0-r1.ebuild new file mode 100644 index 000000000000..b0ac9188780f --- /dev/null +++ b/kde-frameworks/kio/kio-5.96.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 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.4 +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 + =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=( "${FILESDIR}/${P}-fix-crash-in-dropjob.patch" ) # KDE-bug #454747 + +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) + $(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 +}
