commit: a59d298a587a4f21e62c0532578bf0b657b0a1ff Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 12 19:47:32 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 12 22:08:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a59d298a
kde-frameworks/solid: Fix ext. optical drives media change detection KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=394348 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...lid-5.64.0-udisks2-media-change-detection.patch | 65 ++++++++++++++++++++++ kde-frameworks/solid/solid-5.64.0-r1.ebuild | 38 +++++++++++++ 2 files changed, 103 insertions(+) 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 new file mode 100644 index 00000000000..57fd17f7b61 --- /dev/null +++ b/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch @@ -0,0 +1,65 @@ +From 4aa39aed1bd6c81dbf0d6dc9d312af5340f7caab Mon Sep 17 00:00:00 2001 +From: Rok Mandeljc <[email protected]> +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 new file mode 100644 index 00000000000..6eea94371fe --- /dev/null +++ b/kde-frameworks/solid/solid-5.64.0-r1.ebuild @@ -0,0 +1,38 @@ +# 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 +}
