kde-frameworks/solid: drop 6.7.0-r2

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 0 insertions, 191 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 422fd63e3643..c74b4b1019fc 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,4 +1,3 @@
 DIST solid-5.116.0.tar.xz 308000 BLAKE2B 5ed973327c23fb49c4377c4dd434bea2ecf343c9379927ef10ee11fcbef05c419da0423e4436b782dee62ca4d24ef6de25fc751e8014fcc1eb13b8293de4c4ae SHA512 1d6cb0c096bfede35a4b2963cd87e2ef0cb1a6be640d18c737434451e288645f7bbb0657c8ac780f3a60104c153b3b20ed7bd9c90b077d9aa7daea5740947b36
 DIST solid-6.10.0.tar.xz 307236 BLAKE2B f0da2569eff478d47659f478eeab0e48090bcfaf3f4d6062bcb67a103dc425fda6f226bfdcc45e87effa281eefd923c54df0d1b0df0d146a6ae9bb4f641de9e0 SHA512 6898f5fc53ae284b3c9315444dc31cea4cc847e063ab9cdbb98e77c444bf0580e4974bdd18fca275f7ecf90aab7ef467344a87a43bfbc02bb442d74e13e5fa59
-DIST solid-6.7.0.tar.xz 313280 BLAKE2B 421a477b083898aca47c76da5d3b78db731b1b4693c4a4bed612becf478163bab087afa6a73916ebd629480267113055af8564cf0628a2ee1c638807fc9d5774 SHA512 8a5e7670a932d2facccb1a082ff49530d3b16907f90411ba1081c057ce6c5e582aeea63e4e009a9fbf9b50dbe8b21f8af325b3793f8bca99e430cf6b47b32a23
 DIST solid-6.9.1.tar.xz 302320 BLAKE2B a525da8dd684f46b2830ca3bf7d6a5dd2c50d87bc13cd543b11584caaa7b1147fa4e2d6223c63ede7ac78f3956164481b45efe4783b8f25e620523abecc9c7d1 SHA512 4c1d55463a1ff8126e5eecdcabadfdeb284bf5df41b5d1843ec73312db2f0222e265af2c7d85512e8e2d0004775ff829a92074e96354c26d80dd65c105211762
diff --git a/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch b/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch
deleted file mode 100644
index 3f4ad2c9377b..000000000000
--- a/kde-frameworks/solid/files/solid-6.7.0-crashfix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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/files/solid-6.7.0-fix-crash-on-eject.patch b/kde-frameworks/solid/files/solid-6.7.0-fix-crash-on-eject.patch
deleted file mode 100644
index 4b37cec7b13a..000000000000
--- a/kde-frameworks/solid/files/solid-6.7.0-fix-crash-on-eject.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 1852a8c8460a100c3fd09021bf4b26410866def6 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 1 Sep 2024 23:19:55 +0200
-Subject: [PATCH 1/2] [udisks] Don't add/remove devices in slotMediaChanged
-
-We get notified when devices are added via InterfacesAdded/InterfacesRemoved.
-
-When ejecting from a CD drive we first get slotMediaChanged, where we
-remove the device from m_deviceCache. Then we get InterfacesRemoved
-for org.freedesktop.UDisks2.Filesystem. Because the
-org.freedesktop.UDisks2.Block interface is still there we remove and
-immediately readd the device. Then in DeviceManagerPrivate::_k_deviceAdded
-we call createBackendObject, which fails to create a backend because
-the uid is not in m_deviceCache any more. Then we assert because the
-backend is empty.
-
-CCBUG: 464149
-
-(cherry picked from commit 99510948944ecda04f9cec6b3bd94b140d191a1c)
----
-
-From 1c76a103ebae87c99fa7461bc2760544ca0945f8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 1 Nov 2024 17:44:39 +0100
-Subject: [PATCH 2/2] Restore MediaChanged handling for Audio CDs
-
-99510948944ecda04f9cec6b3bd94b140d191a1c removed this because
-it's unneeded for non-audio CDs and is causing problems.
-
-However without it adding or removing audio CDs isn't handled,
-so restore it, but only if there is no FileSystem interface
-(i.e. no data CD)
-
-(cherry picked from commit df5843ed76065f0e56d1189d010e10497c17f936)
----
- src/solid/devices/backends/udisks2/udisksmanager.cpp | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/src/solid/devices/backends/udisks2/udisksmanager.cpp b/src/solid/devices/backends/udisks2/udisksmanager.cpp
-index 1f1a7e73..799face7 100644
---- a/src/solid/devices/backends/udisks2/udisksmanager.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksmanager.cpp
-@@ -265,15 +265,18 @@ void Manager::slotMediaChanged(const QDBusMessage &msg)
-     qulonglong size = properties.value(QStringLiteral("Size")).toULongLong();
-     qCDebug(UDISKS2) << "MEDIA CHANGED in" << udi << "; size is:" << size;
- 
--    if (!m_deviceCache.contains(udi) && size > 0) { // we don't know the optdisc, got inserted
--        m_deviceCache.append(udi);
--        Q_EMIT deviceAdded(udi);
--    }
-+    Device device(udi);
-+    if (!device.interfaces().contains(u"org.freedesktop.UDisks2.Filesystem")) {
-+        if (!m_deviceCache.contains(udi) && size > 0) { // we don't know the optdisc, got inserted
-+            m_deviceCache.append(udi);
-+            Q_EMIT deviceAdded(udi);
-+        }
- 
--    if (m_deviceCache.contains(udi) && size == 0) { // we know the optdisc, got removed
--        Q_EMIT deviceRemoved(udi);
--        m_deviceCache.removeAll(udi);
--        DeviceBackend::destroyBackend(udi);
-+        if (m_deviceCache.contains(udi) && size == 0) { // we know the optdisc, got removed
-+            Q_EMIT deviceRemoved(udi);
-+            m_deviceCache.removeAll(udi);
-+            DeviceBackend::destroyBackend(udi);
-+        }
-     }
- }
- 
diff --git a/kde-frameworks/solid/solid-6.7.0-r2.ebuild b/kde-frameworks/solid/solid-6.7.0-r2.ebuild
deleted file mode 100644
index cade0e37800e..000000000000
--- a/kde-frameworks/solid/solid-6.7.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-}