commit: cb86920e9f343601f2452704de28f8f331a23dd9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 30 14:49:08 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Dec 8 15:07:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb86920e
kde-frameworks/solid: Add dev. desc. for storage medium w/o size Upstream commit c521c9e53693eb6f8f1926db72b78787b063f27f KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445299 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...88.0-dev-desc-for-storage-medium-w-o-size.patch | 37 +++++++++++++++ kde-frameworks/solid/solid-5.88.0-r1.ebuild | 53 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/kde-frameworks/solid/files/solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch b/kde-frameworks/solid/files/solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch new file mode 100644 index 000000000000..d1eff9f9565e --- /dev/null +++ b/kde-frameworks/solid/files/solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch @@ -0,0 +1,37 @@ +From c521c9e53693eb6f8f1926db72b78787b063f27f Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik <[email protected]> +Date: Fri, 19 Nov 2021 12:10:37 +0100 +Subject: [PATCH] Add device description for storage medium without size + +"0B Removable Media" is not very helpful, just omit the size then. +--- + src/solid/devices/backends/udisks2/udisksdevice.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/solid/devices/backends/udisks2/udisksdevice.cpp b/src/solid/devices/backends/udisks2/udisksdevice.cpp +index ad55edd..5d75065 100644 +--- a/src/solid/devices/backends/udisks2/udisksdevice.cpp ++++ b/src/solid/devices/backends/udisks2/udisksdevice.cpp +@@ -576,9 +576,17 @@ QString Device::volumeDescription() const + description = tr("Floppy Disk"); + } else { + if (drive_is_removable) { +- description = tr("%1 Removable Media", "%1 is the size").arg(size_str); ++ if (storageVolume.size() > 0) { ++ description = tr("%1 Removable Media", "%1 is the size").arg(size_str); ++ } else { ++ description = tr("Removable Media"); ++ } + } else { +- description = tr("%1 Media", "%1 is the size").arg(size_str); ++ if (storageVolume.size() > 0) { ++ description = tr("%1 Media", "%1 is the size").arg(size_str); ++ } else { ++ description = tr("Storage Media"); ++ } + } + } + +-- +GitLab + diff --git a/kde-frameworks/solid/solid-5.88.0-r1.ebuild b/kde-frameworks/solid/solid-5.88.0-r1.ebuild new file mode 100644 index 000000000000..71811c0dc72d --- /dev/null +++ b/kde-frameworks/solid/solid-5.88.0-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org optfeature + +DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="ios nls" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + sys-apps/util-linux + sys-fs/udisks:2 + virtual/libudev:= + ios? ( + app-pda/libimobiledevice:= + app-pda/libplist:= + ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) +" +BDEPEND=" + sys-devel/bison + sys-devel/flex + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-dev-desc-for-storage-medium-w-o-size.patch" ) # KDE-bug 445299 + +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 +}
