gentoo resync : 22.12.2021

4 files changed, 43 insertions, 3 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 2246624e7fa8..8deabdeee353 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,6 @@
-DIST solid-5.85.0.tar.xz 251032 BLAKE2B 31fb2c180506ee52955753c9fdae262d940d8e21b626ba9ef3e41b43cc0a26fcc901d7991a5e7f174eb218109cf992dcfc2f05c7bbe3d96b8144634ec8443c48 SHA512 e84148cdc76d8f0c075f5e064c4e7b5a886fb1beb6f343f9ab450cd17db8aa5094f839dd0fc383bc4ef1764e75f1444841bd802093343544cea99ab9668ac4c5
+AUX solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch 1488 BLAKE2B 632c6106072491017b89f8ff399f1fb3ac5fc8437e6b9a89c9189cb4b509bf75ffb659c5f761e820f425da66aec9c2e6c00c7a213cf416c49d25a1408c2c149b SHA512 ef4f462a6ef8ca0fa38b69a84a773a2ae1f737f7925db43b8c8d7dd114bdc3e9e37df1fd825040133cc471e85080aac6ab8b3666df471617152ab6889802de80
 DIST solid-5.88.0.tar.xz 253504 BLAKE2B 8c8ecea29f16ac281ee417ff5223ef4a013860a3c9ac90d4db62badf35d0e230cbc3ffd383ac5ed05fe2956aaea2c403cc713c7efd3baed25c6a95379e5e3b89 SHA512 dbdd619402b036c7d6d4003b1d61ca82e68333a5afb0c424cc8a7236927ac7f42d97c14ad11bebb2729632cbee9681399da2d32dfd1566c400fee8f3a13dc4fa
-EBUILD solid-5.85.0.ebuild 1067 BLAKE2B 04aa78cc9d87f160227816e57973a79d63f17a01f045e4be31999d6e767778afdd033af46a813400877d36e66d52ad94d2be1d159c2c8b07254aca749aab4ccc SHA512 0e2023326ba841c84c7e49ebd5eb038fdc6b3393edc24871cdf77c2e1cff3c365aa3e70ab3e5ca42983c9d5c16b02af978752f9961ad0532da3462da78f84f95
-EBUILD solid-5.88.0.ebuild 1070 BLAKE2B d7ce403eb14867ef0739eeea302f6ca21698ed069fdcb70daa4d2916667c5ecec8f41391ba848303d95d07dd0f9d3abe860a7950038b22a6c79e066db37308ac SHA512 4169376cbab73770a794faf56d32bf8f7c989632726c308d105e8f6114647afbbd4925a1635634795d12978d18d9dd67d16d658e0d550455b7a05f7477c278dd
+DIST solid-5.89.0.tar.xz 256640 BLAKE2B b6cfe8483e0cae57c8886ee67f059a8aaaefdce73d56382bb54dc1705bdc05232f9c2777b11f3d3537af8dbdf9fe480661bfb914121e3f287a75525eebd3d17d SHA512 cd580a01eb6044eb44ff18f2d010cda7cac54ca1ce6ce6d64e6201f07fe31776223136bc22d3e17cd66aa23e6fae192e82a22b8e32a61280d2f3a4dcaae83a24
+EBUILD solid-5.88.0-r1.ebuild 1159 BLAKE2B afcbb67e4eeaf0489c722c35186e93a9c38b0c449bdad36c0d0db5581434ad77dd0880af2fa10d175092053967600a98291d74d07aa4df1cb4ac3476bb203f38 SHA512 b7b4c29420d930e7437995ad933fd45b8801cf39b7fdf85e668530cc9fc5235d9eba32092a46c631353e271eadf5755da1c8bb8c58b903edaa0267d6c6053594
+EBUILD solid-5.89.0.ebuild 1070 BLAKE2B d7ce403eb14867ef0739eeea302f6ca21698ed069fdcb70daa4d2916667c5ecec8f41391ba848303d95d07dd0f9d3abe860a7950038b22a6c79e066db37308ac SHA512 4169376cbab73770a794faf56d32bf8f7c989632726c308d105e8f6114647afbbd4925a1635634795d12978d18d9dd67d16d658e0d550455b7a05f7477c278dd
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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 <kde@privat.broulik.de>
+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.85.0.ebuild b/kde-frameworks/solid/solid-5.88.0-r1.ebuild
index acd12582c4b1..76372124a199 100644
--- a/kde-frameworks/solid/solid-5.85.0.ebuild
+++ b/kde-frameworks/solid/solid-5.88.0-r1.ebuild
@@ -35,6 +35,8 @@ BDEPEND="
 	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)
diff --git a/kde-frameworks/solid/solid-5.88.0.ebuild b/kde-frameworks/solid/solid-5.89.0.ebuild
index 522552e6a6eb..522552e6a6eb 100644
--- a/kde-frameworks/solid/solid-5.88.0.ebuild
+++ b/kde-frameworks/solid/solid-5.89.0.ebuild