summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-09-18 22:38:29 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-09-19 12:39:54 +0200
commit617f3cafac39cc608970df20d9b3281b918a094d (patch)
tree7aaddf7aba874e60080532b3a77dd19fa3732c2d
parentmail-mta/postfix: add 3.9_pre20230916, drop 3.9_pre20230912 (diff)
downloadgentoo-617f3cafac39cc608970df20d9b3281b918a094d.tar.gz
gentoo-617f3cafac39cc608970df20d9b3281b918a094d.tar.bz2
gentoo-617f3cafac39cc608970df20d9b3281b918a094d.zip
kde-frameworks/kio: Backport crashfix per upstream request
See also: https://mail.kde.org/pipermail/distributions/2023-September/001419.html KDE-bug: https://bugs.kde.org/show_bug.cgi?id=474451 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/kio/files/kio-5.110.0-crash.patch28
-rw-r--r--kde-frameworks/kio/kio-5.110.0-r1.ebuild94
2 files changed, 122 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.110.0-crash.patch b/kde-frameworks/kio/files/kio-5.110.0-crash.patch
new file mode 100644
index 000000000000..dcda1cfe06f5
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.110.0-crash.patch
@@ -0,0 +1,28 @@
+From 48322f44323a1fc09305d66d9093fe6c3780709e Mon Sep 17 00:00:00 2001
+From: Kevin Ottens <kevin.ottens@enioka.com>
+Date: Fri, 15 Sep 2023 09:45:58 +0200
+Subject: [PATCH] Don't crash if KMountPoint gives nothing back while checking
+ for CIFS
+
+BUG: 474451
+---
+ src/ioslaves/file/file_unix.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 87c47e7e74..c0bc64354d 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF &buf)
+ static bool isOnCifsMount(const QString &filePath)
+ {
+ const auto mount = KMountPoint::currentMountPoints().findByPath(filePath);
++ if (!mount) {
++ return false;
++ }
+ return mount->mountType() == QStringLiteral("cifs") || mount->mountType() == QStringLiteral("smb3");
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.110.0-r1.ebuild b/kde-frameworks/kio/kio-5.110.0-r1.ebuild
new file mode 100644
index 000000000000..ccba848a7d91
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.110.0-r1.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_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+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 kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+ >=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
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =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}-crash.patch" ) # KDE-bug 474451
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(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
+}