diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-01 13:31:47 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-01 13:32:09 +0100 |
commit | 9888c347166f967a3c56aa6d54ee222c4b5e27aa (patch) | |
tree | 7cb2b503b6a9a58142ba88d0a96b158d9aa81731 /kde-frameworks/solid | |
parent | www-misc/vdradmin-am: moved to acct user/group handling (diff) | |
download | gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.tar.gz gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.tar.bz2 gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.zip |
kde-frameworks: Drop KDE Frameworks 5.64
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/solid')
-rw-r--r-- | kde-frameworks/solid/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch | 65 | ||||
-rw-r--r-- | kde-frameworks/solid/solid-5.64.0-r1.ebuild | 38 |
3 files changed, 0 insertions, 104 deletions
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest index d28d1f2aa7c9..c35ade3bec7f 100644 --- a/kde-frameworks/solid/Manifest +++ b/kde-frameworks/solid/Manifest @@ -1,2 +1 @@ -DIST solid-5.64.0.tar.xz 264304 BLAKE2B 56128117e95e7b142ae83df630183f24fbb46e30f468a01fd39ca3a0d4d67d8ceeb135a05d840b20b0de9d9e1131c8c47bc78761849fa95e311243c8dbcd91d3 SHA512 f1294431973799369afc541db24d33c7c75fd17cce4b843da9c17c782e0a8afd2ba0032e46119c036ddf943747af33c2aa96a1c318ed531c5842b38a1010f857 DIST solid-5.67.0.tar.xz 265740 BLAKE2B 56589131e08782a74157328e366e9d6f835e855324ced74a5d823b71ab50a13952eb2326c20670b0433c273a35209d22b33acf4fa794540a781df0e019d8f4f8 SHA512 fd5e96b397c6de719c0bcea1c44be069d4cce97d1bdd65b20416cd7dc83646bba83915e565b584cf5131d040809b1e3937084552503ccc7d2db0e2e638b453b1 diff --git a/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch b/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch deleted file mode 100644 index 57fd17f7b61b..000000000000 --- a/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4aa39aed1bd6c81dbf0d6dc9d312af5340f7caab Mon Sep 17 00:00:00 2001 -From: Rok Mandeljc <rok.mandeljc@gmail.com> -Date: Tue, 12 Nov 2019 10:20:38 -0700 -Subject: [udisks2] fix media change detection for external optical drives - -Summary: -If an external optical drive is connected after Solid does its initial introspection, the resulting UDI does not get a mediaChanged signal/slot connection, and thus fails to react to the media change. Consequently, disc content is not properly updated after the medium is ejected, causing bug #394348. - -This patch assumes that an addition of "org.freedesktop.UDisks2.Block" interface means that a new device has been added; in this case, it performs Device::mightBeOpticalDisc() check to add the slotMediaChanged() connection. - -BUG: 394348 -FIXED-IN: 5.65 - -Test Plan: -Test steps: -1. Start KDE Plasma session. Make sure K3b is installed. -2. Connect an external USB optical drive. -3. Insert the disc -4. Observe Device action notifications for the inserted disc. -5. Eject the disc. -6. Observe Device action notifications. - -Behavior before patch: after disc is ejected, a "Copy with K3b" action remains available for the drive -See: https://bugs.kde.org/show_bug.cgi?id=394348 - -Behavior after patch: after disc is ejected, no actions remain available for the drive - -Reviewers: bruns, broulik, dfaure, #frameworks, ngraham - -Reviewed By: ngraham - -Subscribers: ngraham, bugseforuns, kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D20508 ---- - src/solid/devices/backends/udisks2/udisksmanager.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/solid/devices/backends/udisks2/udisksmanager.cpp b/src/solid/devices/backends/udisks2/udisksmanager.cpp -index 4982aee..3b76423 100644 ---- a/src/solid/devices/backends/udisks2/udisksmanager.cpp -+++ b/src/solid/devices/backends/udisks2/udisksmanager.cpp -@@ -191,6 +191,18 @@ void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const Vari - - qCDebug(UDISKS2) << udi << "has new interfaces:" << interfaces_and_properties.keys(); - -+ // If device gained an org.freedesktop.UDisks2.Block interface, we -+ // should check if it is an optical drive, in order to properly -+ // register mediaChanged event handler with newly-plugged external -+ // drives -+ if (interfaces_and_properties.contains("org.freedesktop.UDisks2.Block")) { -+ Device device(udi); -+ if (device.mightBeOpticalDisc()) { -+ QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, udi, DBUS_INTERFACE_PROPS, "PropertiesChanged", this, -+ SLOT(slotMediaChanged(QDBusMessage))); -+ } -+ } -+ - updateBackend(udi); - - // new device, we don't know it yet --- -cgit v1.1 diff --git a/kde-frameworks/solid/solid-5.64.0-r1.ebuild b/kde-frameworks/solid/solid-5.64.0-r1.ebuild deleted file mode 100644 index 1f6d4edfb3c0..000000000000 --- a/kde-frameworks/solid/solid-5.64.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - sys-fs/udisks:2 - virtual/libudev:= -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-udisks2-media-change-detection.patch" ) - -pkg_postinst() { - ecm_pkg_postinst - - if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then - elog "For media player support, install app-misc/media-player-info" - fi -} |