gentoo resync : 23.09.2020

7 files changed, 71 insertions, 3 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b8d7cce525d5..4cea1f83570a 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index b6bb45910ea5..537e5207e6a3 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
 DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
 EBUILD breeze-5.18.5.ebuild 1415 BLAKE2B acd856b73e24e7f705e4fb74bc9cdd68425d1954c8c318d71549558c145442428d86878526295f16dde5fe7dc57ae73d6c24e73fff32783cb14fdfb39627d157 SHA512 c08c90f4da1e1a49f18379111592ab9456827e5231e7c07e4695927b676c0f77e72a21482ea2a5879a6c2a5a87a55db5292a6e68bfc41c57390891f3e1292e22
-EBUILD breeze-5.19.5.ebuild 1357 BLAKE2B 0533c143dbaff20dcbb0ea3d19bf2723437b689e930146f29651730c12aa63371cd8580778940ac1105db9e5ff50808c8c97db5036594f953c5b0546a74e696d SHA512 9f7835c4c5f25178912e94bf16c150e65a1866e3aca31bc92feaf26936d8c595a6393734417c66c8b509f8be1ccdcc0703128df23fecc3eb7112afd4c4a3114c
+EBUILD breeze-5.19.5-r1.ebuild 1337 BLAKE2B 5c9746a06bce0dd6a976c06d72cce3f827c3ba18e2d7cdd14a393504068d1e5a8fa62fa784663bd081a2f7bbb72de924d02529ff111b3f027b404e357805b150 SHA512 a9d574149acbf8bccad30258715983269e46d04bf1aba7261be3b2dcce61412f8d30c65a140f917a9893870be092451da339dd58fc913b0200d870ae5aa9479b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.19.5.ebuild b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
index eec8465efe4b..114ad10efecf 100644
--- a/kde-plasma/breeze/breeze-5.19.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
-	sci-libs/fftw:3.0=
 	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index ebba5e3b4f4f..57a9539b6e9c 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,8 +4,10 @@ AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a7186
 AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
 AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
+AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd
+AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
 EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.19.5.ebuild 6927 BLAKE2B 6a7741f0527e8f43b6ae11614f2e649014faab5ab07bbfcf8b7846cd6fe84cf7ec7305c03b45a354011f10f902280fb18d2836c45ae5b67237a423ddac5fb066 SHA512 b5601924602244720ce37769ddb1cacd87a0bcaa96a79c43ecf85b0789ce270cd7a55b059c5f650c41351aa6997291511da618354d5f2d11fdab386ee4a278f9
+EBUILD plasma-workspace-5.19.5-r1.ebuild 7020 BLAKE2B 8e3928bebc84ffb54d82143359c422d50dd2e5b3ddaa1e57e6d910b2645c77b0226e6d60a29f74f8638f85e2e82213d131bae3facaa547fc992786d7b065c2d4 SHA512 9a6f86a031d0509147aa6afadac64869e116042d77be04d61773415579b88ac885c31111eceb334e92a60d734bab7c0069baae619888a92acda7871696d06420
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
new file mode 100644
index 000000000000..64c5e106e10f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
@@ -0,0 +1,29 @@
+From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Aug 2020 14:07:24 +0200
+Subject: [PATCH] Fix build with gpsd 3.21
+
+Adapt to API changes
+---
+ dataengines/geolocation/location_gps.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index 021c29ac5..476117ca3 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -65,7 +65,11 @@ void Gpsd::run()
+             if (m_gpsdata->online) {
+ #endif
+                 //qDebug() << "online";
++#if GPSD_API_MAJOR_VERSION >= 10
++                if (m_gpsdata->fix.status != STATUS_NO_FIX) {
++#else
+                 if (m_gpsdata->status != STATUS_NO_FIX) {
++#endif
+                     //qDebug() << "fix";
+                     d["accuracy"] = 30;
+                     d["latitude"] = QString::number(m_gpsdata->fix.latitude);
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
new file mode 100644
index 000000000000..aa30a4d2cf2a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
@@ -0,0 +1,36 @@
+From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001
+From: Noah Davis <noahadvs@gmail.com>
+Date: Mon, 14 Sep 2020 10:18:57 -0400
+Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
+
+Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
+---
+ lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++--
+ sddm-theme/Login.qml                          | 5 ++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+--- a/lookandfeel/contents/lockscreen/MainBlock.qml
++++ b/lookandfeel/contents/lockscreen/MainBlock.qml
+@@ -97,7 +97,8 @@
+         PlasmaComponents.Button {
+             id: loginButton
+             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
+-            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
++            Layout.preferredHeight: passwordBox.implicitHeight
++            Layout.preferredWidth: loginButton.Layout.preferredHeight
+ 
+             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
+                     anchors.fill: parent
+--- a/sddm-theme/Login.qml
++++ b/sddm-theme/Login.qml
+@@ -112,8 +112,8 @@
+         PlasmaComponents.Button {
+             id: loginButton
+             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
+-            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
+-            Layout.rightMargin: 1 // prevents it from extending beyond the username field
++            Layout.preferredHeight: passwordBox.implicitHeight
++            Layout.preferredWidth: loginButton.Layout.preferredHeight
+ 
+             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
+                 anchors.fill: parent
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
index 2c1b32f36d46..232540bdbe82 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
@@ -126,6 +126,8 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+	"${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
+	"${FILESDIR}/${P}-login-button-size.patch"
 )
 
 RESTRICT+=" test"