diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-19 09:41:18 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-25 10:43:32 +0100 |
commit | 5e0d7860269868681f7cec46c1bf640f3408bbd0 (patch) | |
tree | 650d05195a25902f8275225ee3b036c52fc1b0fa /kde-plasma/bluedevil | |
parent | dev-java/emma: EAPI 8, min java 1.8:* (diff) | |
download | gentoo-5e0d7860269868681f7cec46c1bf640f3408bbd0.tar.gz gentoo-5e0d7860269868681f7cec46c1bf640f3408bbd0.tar.bz2 gentoo-5e0d7860269868681f7cec46c1bf640f3408bbd0.zip |
kde-plasma/bluedevil: drop 5.23.4*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/bluedevil')
-rw-r--r-- | kde-plasma/bluedevil/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild | 45 | ||||
-rw-r--r-- | kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch | 89 |
3 files changed, 0 insertions, 135 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index 63a35b3150b0..e5d622343eee 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,3 +1,2 @@ -DIST bluedevil-5.23.4.tar.xz 171304 BLAKE2B 239dc03d078f38c371446e3a1d73ad667eed2f4aa9c7d434d41ff2c973b5abf6d9b3b8661c7d3907adc55cb588e5481a66039b258a9ba7f468ce331c1dc172dc SHA512 41564e1e7fc7ecf5225063180a69d04c36340bd5b7c4ed8540b1b46b232c43c684e9c3faaafa1ded037c08a4a1bc49a82b9a4660df97e00e5ae2711fceba9a6b DIST bluedevil-5.23.5.tar.xz 171644 BLAKE2B b555e1f56706ae20b5017f6b97c4db9ed6e8ee7e7dba5a8e172e0e6d6e85c695c14bb220e95ef01c9390ad5163dbc4490b5142cb18cfb526fc4efc5f18106123 SHA512 66185703fe36b7da48ccf21db09832a80497562f5f57e539fc11d4e898f5d6f0e47ad94c81ad03ca3b0b82163f40f23b64de3af084453931dfe30861e1e3b000 DIST bluedevil-5.23.90.tar.xz 172152 BLAKE2B 47fe3965ad30bf5e05e0db90634fe3579724743b62e0d97e2737c4ac265f20611a0f5589b64d8a39d60ae41358317df73efc3804c2d1a4770fe68b9d34803316 SHA512 5d31fb14b401171fae27e8f375e4cf933dc1a09d7acb12dfb5baf6c2a216c17de17541534078c317d5bbc06a4461e557411863cb0fb9ba0ebdf490dcea0208aa diff --git a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild deleted file mode 100644 index c50dffa5f1b3..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://invent.kde.org/plasma/bluedevil" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -PATCHES=( - "${FILESDIR}"/${P}-save-bluetooth-status-on-teardown.patch # KDE-bug 445376 -) - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch deleted file mode 100644 index 1a0a28e50ec9..000000000000 --- a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch +++ /dev/null @@ -1,89 +0,0 @@ -From daaa18920ae93b482585eb3df790a6d5a647b6db Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Fri, 19 Nov 2021 19:37:58 -0700 -Subject: [PATCH] Save bluetooth status on teardown - -Instead of watching for the shutdown and restart signals, just save -status anytime kded quits, which automatically covers those use cases as -well as when logging out. This is what the code was already halfway -doing; let's go all the way. - -BUG: 445376 -FIXED-IN: 5.23.5 -(cherry picked from commit e57bb7580251f38e798bea21cdad43a3f90f2568) ---- - src/kded/devicemonitor.cpp | 29 +++-------------------------- - src/kded/devicemonitor.h | 1 - - 2 files changed, 3 insertions(+), 27 deletions(-) - -diff --git a/src/kded/devicemonitor.cpp b/src/kded/devicemonitor.cpp -index 735747ee..5090a8be 100644 ---- a/src/kded/devicemonitor.cpp -+++ b/src/kded/devicemonitor.cpp -@@ -46,15 +46,6 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon) - this, - SLOT(login1PrepareForSleep(bool))); - -- // Catch shutdown events so we can save status when shutting down and -- // optionally resume when starting up -- QDBusConnection::systemBus().connect(QStringLiteral("org.freedesktop.login1"), -- QStringLiteral("/org/freedesktop/login1"), -- QStringLiteral("org.freedesktop.login1.Manager"), -- QStringLiteral("PrepareForShutdown"), -- this, -- SLOT(login1PrepareForShutdown(bool))); -- - // Set initial state - const KConfigGroup globalGroup = m_config->group("Global"); - const QString launchState = globalGroup.readEntry("launchState", "remember"); -@@ -75,17 +66,11 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon) - } - } - --// Save state when tearing down to avoid getting out of sync if kded crashes --// or is manually restarted - DeviceMonitor::~DeviceMonitor() - { -- KConfigGroup globalGroup = m_config->group("Global"); -- -- if (m_manager->isBluetoothBlocked()) { -- globalGroup.writeEntry<bool>("bluetoothBlocked", true); -- } else { -- globalGroup.deleteEntry("bluetoothBlocked"); -- } -+ // Save state when tearing down to avoid getting out of sync if kded crashes -+ // or is manually restarted -+ saveState(); - } - - KFilePlacesModel *DeviceMonitor::places() -@@ -140,14 +125,6 @@ void DeviceMonitor::login1PrepareForSleep(bool active) - } - } - --void DeviceMonitor::login1PrepareForShutdown(bool active) --{ -- if (active) { -- qCDebug(BLUEDAEMON) << "About to shut down"; -- saveState(); -- } --} -- - void DeviceMonitor::saveState() - { - KConfigGroup adaptersGroup = m_config->group("Adapters"); -diff --git a/src/kded/devicemonitor.h b/src/kded/devicemonitor.h -index 6a35fed4..a7b38cab 100644 ---- a/src/kded/devicemonitor.h -+++ b/src/kded/devicemonitor.h -@@ -35,7 +35,6 @@ private Q_SLOTS: - - void deviceConnectedChanged(bool connected); - void login1PrepareForSleep(bool active); -- void login1PrepareForShutdown(bool active); - - private: - void restoreState(); --- -GitLab - |