gentoo resync : 02.02.2022

3 files changed, 37 insertions, 1 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 9782e125cf0f..f4bd6858e56b 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,7 @@
 AUX solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch 1488 BLAKE2B 632c6106072491017b89f8ff399f1fb3ac5fc8437e6b9a89c9189cb4b509bf75ffb659c5f761e820f425da66aec9c2e6c00c7a213cf416c49d25a1408c2c149b SHA512 ef4f462a6ef8ca0fa38b69a84a773a2ae1f737f7925db43b8c8d7dd114bdc3e9e37df1fd825040133cc471e85080aac6ab8b3666df471617152ab6889802de80
+AUX solid-5.90.0-properly-round-battery-capacity.patch 1077 BLAKE2B 83e2da4013c8437ab5d1351ba31ec57ea76123c1a0853494919a868acdd6d6014073749133f9e967b7ae19729f642b08726914da9f43056d3290b3061ddcc7b7 SHA512 83d451f3041c7f623f53d185c16dfef78603eaed528deec25d2fa4fef45f86aa1aacdf04467f534b4f1ed27bbc8dc68f9e39259d2b9bafe4b4ffba1cd2336438
 DIST solid-5.88.0.tar.xz 253504 BLAKE2B 8c8ecea29f16ac281ee417ff5223ef4a013860a3c9ac90d4db62badf35d0e230cbc3ffd383ac5ed05fe2956aaea2c403cc713c7efd3baed25c6a95379e5e3b89 SHA512 dbdd619402b036c7d6d4003b1d61ca82e68333a5afb0c424cc8a7236927ac7f42d97c14ad11bebb2729632cbee9681399da2d32dfd1566c400fee8f3a13dc4fa
 DIST solid-5.90.0.tar.xz 256768 BLAKE2B 932a08f48cc84eb31f9038b1e3f4233a7988efe6600b2b500292da878ff00690155334c24145ba0b52f598025eebd5b05165d395bb4d6409b7c42e165087ab7d SHA512 407ebc65b96f4e74862e30a80016c58d338ddc6e037cee5dbec928e3c2a6d1ae8d81e76eaf9a7a619ef2b7c0bad6e7642a96da0fbbe158fcf90519c5b2d758d7
 EBUILD solid-5.88.0-r1.ebuild 1159 BLAKE2B afcbb67e4eeaf0489c722c35186e93a9c38b0c449bdad36c0d0db5581434ad77dd0880af2fa10d175092053967600a98291d74d07aa4df1cb4ac3476bb203f38 SHA512 b7b4c29420d930e7437995ad933fd45b8801cf39b7fdf85e668530cc9fc5235d9eba32092a46c631353e271eadf5755da1c8bb8c58b903edaa0267d6c6053594
-EBUILD solid-5.90.0.ebuild 1070 BLAKE2B 47664260902acdb23f6584951d512cc054a937fede2d6fbc72e39f1f0265d059988b7d2d170c21ad79b27a59e7982ad5305d2cc45610bc43ee0e674edef17001 SHA512 5f1874695511701ce12db955fccc667ad1e5809561a45e54c1f477be8d667e2d832dc47ccf957658078a641ecde8cecd0f0d000d489af728d9612e1670e43a1b
+EBUILD solid-5.90.0-r1.ebuild 1158 BLAKE2B 267e512de25ee770076a70a717179b26cc788582ad1be129cc12ac80ebee6197c114db4d6acca07fcf04fd83dc13cf1e38bce675dbda72320cd1493825777ace SHA512 010a92c85f7565de50903d2047a300f12b78f6eaa24fd948ee5fb7a588bbc587151471484e512390bfb5f3ce46742bae4249c57801a13bc361b34ca87faa6985
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch b/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch
new file mode 100644
index 000000000000..77296074bfa7
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch
@@ -0,0 +1,31 @@
+From 2f305a7134f27489203c3fd2e9ca81790f35ac3b Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Mon, 17 Jan 2022 02:24:44 +0300
+Subject: [PATCH] [upower] Properly round up battery's capacity
+
+The same rounding is already used for charge percent just few lines
+above. Without it, for example, values that are close to 100%
+(e.g. 99.9825%) were rounded down to 99% instead of up to 100%.
+
+BUG: 448372
+FIXED-IN: 5.91
+---
+ src/solid/devices/backends/upower/upowerbattery.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/solid/devices/backends/upower/upowerbattery.cpp b/src/solid/devices/backends/upower/upowerbattery.cpp
+index 22b25d9..055856b 100644
+--- a/src/solid/devices/backends/upower/upowerbattery.cpp
++++ b/src/solid/devices/backends/upower/upowerbattery.cpp
+@@ -84,7 +84,7 @@ int Battery::chargePercent() const
+ 
+ int Battery::capacity() const
+ {
+-    return m_device.data()->prop("Capacity").toDouble();
++    return qRound(m_device.data()->prop("Capacity").toDouble());
+ }
+ 
+ bool Battery::isRechargeable() const
+-- 
+GitLab
+
diff --git a/kde-frameworks/solid/solid-5.90.0.ebuild b/kde-frameworks/solid/solid-5.90.0-r1.ebuild
index 28d6fc82200b..4848819bb62a 100644
--- a/kde-frameworks/solid/solid-5.90.0.ebuild
+++ b/kde-frameworks/solid/solid-5.90.0-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-properly-round-battery-capacity.patch" # KDE-bug 448372
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ios IMobileDevice)