gentoo auto-resync : 15:12:2024 - 02:02:03

5 files changed, 126 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 5e865ce3cb63..022e16aaa2e1 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 4b4238ab87d2..d43060d416d6 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,9 +1,11 @@
 AUX solid-5.116.0-accessibilityChanged-only-when-changed.patch 1811 BLAKE2B 70d78c89959fb7911b3d490949069a8f644feddecafce334e26c11c5e7ccf093b5110769abfb52e1d9825098927d1d936ef170e73f2e0a2cb7657c6e1c35f86b SHA512 7f533d001857a4fffc503258c3f5a06d335b2152f130c9d79f74db91234c7e137fbc6c8dc1d56951b8581d0b810dbb49f3119d4fd187d5c4d6b63ae06ee45a35
+AUX solid-6.7.0-crashfix.patch 1729 BLAKE2B a271698a99245261baa4a2cbd2060ed3ddeef42d875d6793f826ea67bac0efd66fe094d347d01f26de8e84d36f544f590734481a4776628a8096ec6ebd83b7af SHA512 b3add0f90f69ed490e3323a79025c1ef6c861e1280bda455c0922c559657679fa1afcd613516f8f698e52f90c35d61e33732820213e38cbe1ffc4c1f9e300894
 AUX solid-6.7.0-fix-crash-on-eject.patch 3001 BLAKE2B f1b351298a5298c6b0d0f5c2862617c324fb9fbbff14e26c58624cf3506a75ca2a204d666d4006efa69d0acafceba2ded7af12c970833fb3e80b9f1821cb1157 SHA512 4a0f78eeb6ca75b4eeeb3083d7b72dee7a99db568cbdee603aa1bd1b142a90c0839fa6c476f11775b13d5754428c8eb0eab9a77e9cc6c31ae32e5a64f05c7386
 DIST solid-5.116.0.tar.xz 308000 BLAKE2B 5ed973327c23fb49c4377c4dd434bea2ecf343c9379927ef10ee11fcbef05c419da0423e4436b782dee62ca4d24ef6de25fc751e8014fcc1eb13b8293de4c4ae SHA512 1d6cb0c096bfede35a4b2963cd87e2ef0cb1a6be640d18c737434451e288645f7bbb0657c8ac780f3a60104c153b3b20ed7bd9c90b077d9aa7daea5740947b36
 DIST solid-6.7.0.tar.xz 313280 BLAKE2B 421a477b083898aca47c76da5d3b78db731b1b4693c4a4bed612becf478163bab087afa6a73916ebd629480267113055af8564cf0628a2ee1c638807fc9d5774 SHA512 8a5e7670a932d2facccb1a082ff49530d3b16907f90411ba1081c057ce6c5e582aeea63e4e009a9fbf9b50dbe8b21f8af325b3793f8bca99e430cf6b47b32a23
 DIST solid-6.8.0.tar.xz 301832 BLAKE2B 346493a1e03289f2b21e91f6aa86636967b22d88f85789b4604c5fbdfbbe5901927f86015c8504cc0f404fb6d42adab12673bab2925ef5bcc649bc661eb09de6 SHA512 d012ed6197739c12cf7265810bde00ad2d135943e392bc67ac3c9aa3fb8e19e395dad93ba963708701f1f156d19ab7ebe7f7d605fac42e86dddaf240834f1667
 EBUILD solid-5.116.0-r1.ebuild 1135 BLAKE2B 6f8f51ab8741fee86a64ab889ff0164b871e527ab7a1c2f95fe78025079ec8d435daadac0c104c0946c2b55e7e615d0ca8af62cf9df2385f6557d743ab5c2fd5 SHA512 4089bead0b3a7bdca83748b029d1d1d1a3f428c355dd8bd745dd3bd4f910346ed078290b6b289bd3161151beb280976383bf44903d3e267dd4b8700657688348
 EBUILD solid-6.7.0-r1.ebuild 1089 BLAKE2B 6755802468e686d9b18ce667b2c1a807d425b7fee2c36273b954a6c304fc3844eda1fada5fe3f7e1011a58cc5254a48b4131c7d9dd227492d9a681c0b5907f21 SHA512 221f12596b62d5bdd82122660e75b207148e6ff3d57088d1dfac28b069e6e8c2a0f4cf5c9726cff983573970e89e6d2a656a0bace445c00d59a7312630a25b57
-EBUILD solid-6.8.0.ebuild 1018 BLAKE2B a99827a574ff16d6611707bbf27221cab00dbcd2e953ae30d3f1d247f9872b4ed6a0b70a0a0f6a9eb6fcade6c8a2165402abebb9e89c062ab785d4cdc45bb748 SHA512 0906a8aaf9ee12eca67a5368cb3ed4062c23914c09ce9d28ff31d50f3c64fdb3409029698360020688dd2220d8b226d84fb263cf4b15099018f229b52e97ca3e
+EBUILD solid-6.7.0-r2.ebuild 1154 BLAKE2B 0e790898e755436ef8d66e1192df22b4ae772fb4c3b6c438af77f25e6dd8f3bb94b5136586c992834bb17a32affd43d45fa50e7817c9b475dcc5fdd7bac0a874 SHA512 10243539cfe118c28960af196b4a70fe454c253b9752caad3cc59e625a872421fa5550df5e05a733f898dac052314273c912a41f4b0c81e4ba79b272d44b54ed
+EBUILD solid-6.8.0-r1.ebuild 1098 BLAKE2B 90edf0694d0a8c7643ba09fa9da6ae076c7756d66787c8c33bbbd12f13c66078d1a3d2b941536ec4271d3d9e0f4da2f1c9fac83fd64581d1cca235e2bff60fb3 SHA512 dd32014f72e573f95eea9f60a07945eb6a25df9645811120645413cbb47458f0bfb47a333b46f53d324e5c0aa9545be25189f0053a446f2f58918a0648c7c6d2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch b/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch
new file mode 100644
index 000000000000..3f4ad2c9377b
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch
@@ -0,0 +1,68 @@
+From 11a21dfad782c3862f6a3fba9bcf4fd5c5005777 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 11 Dec 2024 22:58:47 +0100
+Subject: [PATCH] Add null check for StorageAccess interface in
+ storageAccessFromPath
+
+In slotInterfacesRemoved we do a remove+add cycle
+
+During that cycle the backend object is null, so querying the StorageAccess
+interface will return null.
+
+This means that when something calls storageAccessFromPath in reaction to
+the removed signal we will get a null StorageAccess.
+
+The overall design is a bit shaky here, but we can handle it more gracefully
+by checking the result for null
+
+BUG: 497299
+
+CCBUG: 492578
+
+SENTRY: PLASMA-WORKSPACE-11Q1
+
+SENTRY: KDECONNECT-KDE-BK
+
+SENTRY: DOLPHIN-320
+
+SENTRY: KDED-7M
+
+SENTRY: FALLTHROUGH-62S
+
+SENTRY: KATE-Y3
+
+SENTRY: KDENLIVE-VR
+
+SENTRY: XDG-DESKTOP-PORTAL-KDE-3R
+
+SENTRY: KDEVELOP-93
+
+SENTRY: KRUNNER-GD
+
+SENTRY: PLASMA-WORKSPACE-1986
+
+SENTRY: ELISA-9H
+(cherry picked from commit 2f8825b489ecc69bed67a49abdcb643d1fa42b4a)
+---
+ src/solid/devices/frontend/devicemanager.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/solid/devices/frontend/devicemanager.cpp b/src/solid/devices/frontend/devicemanager.cpp
+index 896a1826..9559592a 100644
+--- a/src/solid/devices/frontend/devicemanager.cpp
++++ b/src/solid/devices/frontend/devicemanager.cpp
+@@ -161,6 +161,11 @@ Solid::Device Solid::Device::storageAccessFromPath(const QString &path)
+         }
+ 
+         auto storageAccess = device.as<StorageAccess>();
++
++        if (!storageAccess) {
++            continue;
++        }
++
+         QString mountPath = storageAccess->filePath();
+ 
+         if (mountPath.size() <= match_length || !path.startsWith(mountPath)) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/solid/solid-6.7.0-r2.ebuild b/kde-frameworks/solid/solid-6.7.0-r2.ebuild
new file mode 100644
index 000000000000..b0d4d513d64e
--- /dev/null
+++ b/kde-frameworks/solid/solid-6.7.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ios"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	sys-apps/util-linux
+	sys-fs/udisks:2
+	virtual/libudev:=
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-on-eject.patch" # KDE-bug 464149
+	"${FILESDIR}/${P}-crashfix.patch" # KDE-bugs 497299, 492578
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/solid/solid-6.8.0.ebuild b/kde-frameworks/solid/solid-6.8.0-r1.ebuild
index 90649873bd76..78ea44f3b1dd 100644
--- a/kde-frameworks/solid/solid-6.8.0.ebuild
+++ b/kde-frameworks/solid/solid-6.8.0-r1.ebuild
@@ -32,6 +32,8 @@ BDEPEND="
 	>=dev-qt/qttools-${QTMIN}:6[linguist]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-6.7.0-crashfix.patch" ) # KDE-bugs 497299, 492578
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ios IMobileDevice)