gentoo resync : 22.01.2021

4 files changed, 110 insertions, 3 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 04451b36b649..ecd1b10995b6 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,8 +5,10 @@ AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE
 AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd
 AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390
 AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
+AUX plasma-workspace-5.20.5-avoid-render-invisible-contents.patch 1584 BLAKE2B a834e83b005575379f4ff3aec18b48bfa045c52ad5fb1483c41902c8dca6a9cadd855b8186128c0ebcbdf4ec63cbefdebe3f9e65b1a4ea9dfb94ad66702ac9db SHA512 4be1982217a33f9a90c929308e2ddfd8d92285d08a521f3039b1588bdfaa62b52dae1053aee19e25dda841e987698f286cf277d247a293868f087809747d0ebd
+AUX plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch 2326 BLAKE2B 97dd0c98b06bb37272e322ce6fda980d26213d4621f5bb82b91ac3293ea41f2c84c243d1f54a86f4f0a5848ecac03d7a39242e0bdf2de7648dec07f29cdf2320 SHA512 9c2ac24acb748975f0c7a5a5f1c3c6fb586151c01714e7dc35b46179ab7917ea2e47c9e5edaa324ea75346cd95d4ad625616c3971b7a078f5d903be7cefe3013
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
 EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149
-EBUILD plasma-workspace-5.20.5.ebuild 5987 BLAKE2B ff60e9a235b312313b0dae7022185e4f73df7b601b35c33360f22593d5e92685a656df8407e52f6a56fdd89c146c1baee9c9678402a63b84e12037b002c026e2 SHA512 e20b885f0489419ac7d8c9a4237af7ceda4fb2de5eed2e495f28d7922ff451e9a60d2067f39fd148f22983133c846a54ebd0cb224bc9ef8433b7194dd318c277
+EBUILD plasma-workspace-5.20.5-r1.ebuild 6133 BLAKE2B db76b7ea70089f783343e8c5a798b60a4b10a5aa71be70e528c1f094381723c6f504e2370007e559952523c8f88962674a90ab947e9c8996b6f7d8d8aa7477d3 SHA512 2053f891d927fb3c3174c50813fb9fb788faa4ed7a5e9dec06c47996ab6e25bb6a0adf1b74f2cbfba6dd4ef3e68b494c5c2ba1e53027e4121ff76e65c138d399
 MISC metadata.xml 848 BLAKE2B 60b6be066ec5e396d88f6e57774e7bde6e9906de72b808d7e4887fde6f8fdd4e99667e30e244602e92c10aa8950d583adf78b6e122b4a9dc60a7a538aa69663b SHA512 77e385066c166cb8a43b531e0e079f39004d645364237d1ead4a26816297edec7283cf551310f1c0643692eb8794bce74a949b00b049f140da2e2f7a6fb2689a
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
new file mode 100644
index 000000000000..effea7fdc8e1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
@@ -0,0 +1,38 @@
+From 45e0a722fb85bb5d1ab8bef92080e934254b13aa Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 7 Jan 2021 13:36:29 +0000
+Subject: [PATCH] [lookandfeel] Avoid rendering invisible contents
+
+An opacity of 0 but still visible still results in nodes in the
+scenegraph, which is wasteful.  This is shown in gammaray with some
+warnings.
+
+Enabled is also bound to visible as if a text field has focus it still
+animates the cursor icon even if inivisble, producing wakeups.
+
+BUG: 347772
+FIXED-IN: 5.21
+---
+ lookandfeel/contents/lockscreen/LockScreenUi.qml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+index a2eba8e6d..83564fc0a 100644
+--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
++++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+@@ -228,6 +228,12 @@ PlasmaCore.ColorScope {
+             height: lockScreenRoot.height + units.gridUnit * 3
+             focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it
+ 
++            // this isn't implicit, otherwise items still get processed for the scenegraph
++            visible: opacity > 0
++            // changing enabled will toggle if an item can have activeFocus, which otherwise
++            //keeps the text cursor blinking even when invisble
++            enabled: visible
++
+             initialItem: MainBlock {
+                 id: mainBlock
+                 lockScreenUiVisible: lockScreenRoot.uiVisible
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
new file mode 100644
index 000000000000..58f3a50c4911
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
@@ -0,0 +1,63 @@
+From fa2bafea8f0cd9fac0864ac23f23c955d5f15b73 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Tue, 5 Jan 2021 23:57:19 +0000
+Subject: [PATCH] [panel] Fix crash on screen changes
+
+There is an error handling path when we fetch the relevant config()
+
+```
+KConfigGroup PanelView::panelConfig(...
+{
+    if (!containment || !screen) {
+        return KConfigGroup();
+    }
+```
+
+which we indiscrimiately call parent() on.
+
+This patch guards that case, which is presumably screen being
+temporarily null.
+
+This code is also Plasma 5.8 compatibility fallback, so arguably we
+could get rid of it.
+
+BUG: 425711
+---
+ shell/panelview.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 28e86d2d3..991364e97 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -561,7 +561,8 @@ void PanelView::resizePanel()
+ 
+ void PanelView::restore()
+ {
+-    if (!containment()) {
++    KConfigGroup panelConfig = config();
++    if (!panelConfig.isValid()) {
+         return;
+     }
+ 
+@@ -572,7 +573,7 @@ void PanelView::restore()
+     //but if fails read it from the resolution dependent one as
+     //the place for this config key is changed in Plasma 5.9
+     //Do NOT use readConfigValueWithFallBack
+-    setAlignment((Qt::Alignment)config().parent().readEntry<int>("alignment", config().readEntry<int>("alignment", m_alignment)));
++    setAlignment((Qt::Alignment)panelConfig.parent().readEntry<int>("alignment", panelConfig.readEntry<int>("alignment", m_alignment)));
+ 
+     // All the other values are read from screen independent values,
+     // but fallback on the screen independent section, as is the only place
+@@ -599,7 +600,7 @@ void PanelView::restore()
+     //but if fails read it from the resolution dependent one as
+     //the place for this config key is changed in Plasma 5.9
+     //Do NOT use readConfigValueWithFallBack
+-    setVisibilityMode((VisibilityMode)config().parent().readEntry<int>("panelVisibility", config().readEntry<int>("panelVisibility", (int)NormalPanel)));
++    setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
+     m_initCompleted = true;
+     resizePanel();
+     positionPanel();
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild
index 3b0559d0e91f..1e0e478654ec 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
@@ -141,7 +141,11 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+	"${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+)
 
 RESTRICT+=" test"