gentoo resync : 17.02.2020

4 files changed, 177 insertions, 1 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 0dc71599f4b1..4142b3de61a9 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,7 @@
+AUX plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch 966 BLAKE2B c3124a608ba4d98c72fae39a1e934fbb5cfdaca3c9ae6c007aa543cfd6d5d8e1df75252e58e86b4ba41088199f20e5225c5beb891670b8c2ee06dd7fed7f766a SHA512 daad08bcfdcad504f8e51290992d1d065e043af35624f02b24caedda4ee4c1d06f399f94edd3ec214e3a5f8f6e631c2ea0a7faf1843c7aa6678fe0aa6c8743fb
+AUX plasma-5.67.0-remove-hardcoded-colors.patch 7414 BLAKE2B e56f7055afa03767cecebd9954158d74cb97b837dd474f2f710b4e00548f5bf64cc3571aa22802ade239ab6794030760e4f223c14a3011d93f46783c4dac34f5 SHA512 cb3bc11054231344678ffbe629b5c4cf76d098ab05e932b340870d705d61cd6725425463bbaf4276040c24c1058e237643977c68d62f78848c2bb0510f4addb2
 DIST plasma-framework-5.64.0.tar.xz 3120788 BLAKE2B c9c008e4b4b711ba4c370ba95029c4fc7392fe298057f5f8fe959118ad873325cfef3e3a93cee0dc73c7ce786287f18ab661f22e9f32c5f706aca5d15b70d24a SHA512 d0dcdbc4c537d064a125cef11d07e562a9a3b1bd83442217f8f435260420753c34b4dfddd733fc497533bf16a22fad3746884764395e07cf0f268d5f8435ef3c
 DIST plasma-framework-5.67.0.tar.xz 3127592 BLAKE2B 15eabb6b3c62117ee64a8ceb2c6cee9d1df29942785b5e0e061f062e4ddc5cedb0ea73ea17e597bb09a5eef868cb8aafe81a25d51af19691f05152d05b916f8d SHA512 3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92
 EBUILD plasma-5.64.0.ebuild 1899 BLAKE2B e63ebf02875b1bcafe8fcdc4a808b825bf9308c9beb389c9a1f748d04df385740f57fc76a4c87108ba1e8ae9162a557847eedd882336170aade350139bef13d9 SHA512 30dfcde51067155c381cc15f58d182fcb4dbe121ecc9fc8cd0b277cd6c74ed1807b051a64e485bc681a9ec5471576dd9c63819bd535389ed72d1686655784c73
-EBUILD plasma-5.67.0.ebuild 1910 BLAKE2B 0825529d74614bf1695219f9b363297fc8f879e4e58346582984399e799bf55e2f8111fbcd96b80f0aa8589187062f2b1e1864514768e948481336b5db71b96e SHA512 bf81cd8a5b452032602ac078468d3726cc4efcb843945b3a4323e7a212e1777f7e522638f1a708861437c4bae61d28c575259119e4efa64a232678b4ab1b83da
+EBUILD plasma-5.67.0-r2.ebuild 2074 BLAKE2B bc5f5216484c09b37a78cefc5a0ffe097b35afee147f4fa985bee65580818f9b22e655c7dc3a4950254527c6dd4a27cab372d98a516a21e90dcbc926cc3a063f SHA512 bf26ebe3ab212f3681ff66fcbe51559611663c3ba16a3069e247d4531e621c17f21b6058dd3fbfac61cbec85aef083cacb7d4b2bc6b342c646ca1869fe702c00
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch b/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch
new file mode 100644
index 000000000000..333010933193
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch
@@ -0,0 +1,29 @@
+From 1dc36bc2cee489e621a52fb4456ff28cf6a64685 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Thu, 13 Feb 2020 15:21:22 +0100
+Subject: Construct NullEngine with KPluginMetaData()
+
+The deprecated constructor taking a KPluginInfo unconditionally calls toMetaData() and then asserts.
+
+BUG: 417548
+
+Differential Revision: https://phabricator.kde.org/D27366
+---
+ src/plasma/private/dataenginemanager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasma/private/dataenginemanager.cpp b/src/plasma/private/dataenginemanager.cpp
+index 221440c..852c17a 100644
+--- a/src/plasma/private/dataenginemanager.cpp
++++ b/src/plasma/private/dataenginemanager.cpp
+@@ -40,7 +40,7 @@ class NullEngine : public DataEngine
+ {
+ public:
+     explicit NullEngine(QObject *parent = nullptr)
+-        : DataEngine(KPluginInfo(), parent)
++        : DataEngine(KPluginMetaData(), parent)
+     {
+         setValid(false);
+ 
+-- 
+cgit v1.1
diff --git a/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch b/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch
new file mode 100644
index 000000000000..8b408749052a
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.67.0-remove-hardcoded-colors.patch
@@ -0,0 +1,140 @@
+From 1ed47e7c4188ed0f047dda40093ea0213ae4a433 Mon Sep 17 00:00:00 2001
+From: Niccol Venerandi <niccolo@venerandi.com>
+Date: Wed, 12 Feb 2020 20:12:05 +0100
+Subject: Remove hardcoded colors
+
+Summary:
+Fixes https://www.reddit.com/r/kde/comments/f2mxd3/517_seeing_weird_white_corners_on_my_autohiding/
+
+BUG:417511
+
+Reviewers: ndavis
+
+Reviewed By: ndavis
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D27354
+---
+ .../breeze/translucent/widgets/panel-background.svg    |  8 ++++----
+ src/desktoptheme/breeze/widgets/panel-background.svg   | 18 +++++++++---------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/desktoptheme/breeze/translucent/widgets/panel-background.svg b/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
+index eae58ed..9c9c3dd 100644
+--- a/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
++++ b/src/desktoptheme/breeze/translucent/widgets/panel-background.svg
+@@ -1025,28 +1025,28 @@
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 158.49999,954.61232 v -1.37503 -5.5001 -1.37503 h 1.37503 1.37502 4.12508 1.37503 v 1.37503 2.75005 c 0,2.75005 -1.37503,4.12508 -4.12508,4.12508 h -1.37503 -1.37502 z"
+        id="mask-bottomright" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 131,954.6123 v -1.37503 -5.5001 -1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v 1.37503 2.75005 c 0,2.75005 1.37503,4.12508 4.12508,4.12508 h 1.37503 1.37502 z"
+        id="mask-bottomleft" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 131.00016,910.61202 v 1.37503 5.5001 1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v -1.37503 -2.75005 c 0,-2.75005 1.37503,-4.12508 4.12508,-4.12508 h 1.37503 1.37502 z"
+        id="mask-topleft" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 158.49998,910.61202 v 1.37503 5.5001 1.37503 h 1.37503 1.37502 4.12508 1.37503 v -1.37503 -2.75005 c 0,-2.75005 -1.37503,-4.12508 -4.12508,-4.12508 h -1.37503 -1.37502 z"
+        id="mask-topright" />
+     <g
+diff --git a/src/desktoptheme/breeze/widgets/panel-background.svg b/src/desktoptheme/breeze/widgets/panel-background.svg
+index 9b9bb99..4f2a832 100644
+--- a/src/desktoptheme/breeze/widgets/panel-background.svg
++++ b/src/desktoptheme/breeze/widgets/panel-background.svg
+@@ -1017,35 +1017,35 @@
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 159.49999,954.61234 v -1.37503 -5.5001 -1.37503 h 1.37503 1.37502 4.12508 1.37503 v 1.37503 2.75005 c 0,2.75005 -1.37503,4.12508 -4.12508,4.12508 h -1.37503 -1.37502 z"
+        id="mask-bottomright" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 132,954.61232 v -1.37503 -5.5001 -1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v 1.37503 2.75005 c 0,2.75005 1.37503,4.12508 4.12508,4.12508 h 1.37503 1.37502 z"
+        id="mask-bottomleft" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 132.00016,910.61204 v 1.37503 5.5001 1.37503 h -1.37503 -1.37502 -4.12508 -1.37503 v -1.37503 -2.75005 c 0,-2.75005 1.37503,-4.12508 4.12508,-4.12508 h 1.37503 1.37502 z"
+        id="mask-topleft" />
+     <path
+        sodipodi:nodetypes="cccccccccssccc"
+        class="ColorScheme-Background"
+        inkscape:connector-curvature="0"
+-       style="color:#eff0f1;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
++       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.37502706"
+        d="m 159.49998,910.61204 v 1.37503 5.5001 1.37503 h 1.37503 1.37502 4.12508 1.37503 v -1.37503 -2.75005 c 0,-2.75005 -1.37503,-4.12508 -4.12508,-4.12508 h -1.37503 -1.37502 z"
+        id="mask-topright" />
+     <g
+        transform="translate(0,-2.0185303e-5)"
+        id="topleft">
+       <path
+-         style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++         style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+          d="m 16,6 c -2,0 -3,1 -3,3 v 2 1 h 4 1 1 V 11 7 6 h -1 1 z"
+          transform="translate(0,904.36218)"
+          id="rect4159"
+@@ -1057,7 +1057,7 @@
+        transform="translate(0,-2.0185303e-5)"
+        id="topright">
+       <path
+-         style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++         style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+          d="m 51,6 v 1 4 1 h 1 1 3 1 V 11 9 C 57,7 56,6 54,6 h -1 -1 z"
+          transform="translate(0,904.36218)"
+          id="rect4177"
+@@ -1070,7 +1070,7 @@
+        id="bottomleft">
+       <path
+          inkscape:connector-curvature="0"
+-         style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++         style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+          d="m 19,954.36218 v -1 -4 -1 h -1 -1 -3 -1 v 1 2 c 0,2 1,3 3,3 h 1 1 z"
+          id="path5048"
+          class="ColorScheme-Background"
+@@ -1078,11 +1078,11 @@
+     </g>
+     <g
+        transform="translate(0,-2.0185303e-5)"
+-       id="bottomright">
++       id="bottomright"> 
+       <path
+          id="rect4177-6"
+          d="m 51,954.36218 v -1 -4 -1 h 1 1 3 1 v 1 2 c 0,2 -1,3 -3,3 h -1 -1 z"
+-         style="color:#eff0f1;opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
++         style="opacity:0.9;fill:currentColor;fill-opacity:1;stroke:none"
+          inkscape:connector-curvature="0"
+          class="ColorScheme-Background"
+          sodipodi:nodetypes="cccccccccssccc" />
+-- 
+cgit v1.1
diff --git a/kde-frameworks/plasma/plasma-5.67.0.ebuild b/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild
index 27066b6b7ad3..7155e18e8ab4 100644
--- a/kde-frameworks/plasma/plasma-5.67.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild
@@ -62,6 +62,11 @@ DEPEND="${RDEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-construct-nullengine-w-KPluginMetadata.patch" # KDE-Bug #417548
+	"${FILESDIR}/${P}-remove-hardcoded-colors.patch" # KDE-Bug #417511
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2 OpenGL)