Merge pull request #6299 from Rmys/master

plasma-workspace:rebuild

desktop/kde/plasma/plasma-workspace/files/390890.patch

@@ -0,0 +1,41 @@
+From 0885170daf56fbb2d5558ae271bb44043a76d018 Mon Sep 17 00:00:00 2001
+From: Anthony Fieroni <bvbfan@abv.bg>
+Date: Mon, 14 Jan 2019 20:14:02 +0200
+Subject: [systemtray] Workaround component creation
+
+CCBUG: 390890
+
+Differential Revision: https://phabricator.kde.org/D16890
+
+Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
+---
+ applets/systemtray/package/contents/ui/main.qml | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
+index 55623e5..4e56996 100644
+--- a/applets/systemtray/package/contents/ui/main.qml
++++ b/applets/systemtray/package/contents/ui/main.qml
+@@ -50,7 +50,8 @@ MouseArea {
+ 
+     property alias statusNotifierModel: statusNotifierModel
+ 
+-    property Component plasmoidItemComponent
++    // workaround https://bugreports.qt.io/browse/QTBUG-71238 / https://bugreports.qt.io/browse/QTBUG-72004
++    property Component plasmoidItemComponent: Qt.createComponent("items/PlasmoidItem.qml")
+ 
+     Plasmoid.onExpandedChanged: {
+         if (!plasmoid.expanded) {
+@@ -102,9 +103,6 @@ MouseArea {
+     }
+ 
+     Containment.onAppletAdded: {
+-        if (!plasmoidItemComponent) {
+-            plasmoidItemComponent = Qt.createComponent("items/PlasmoidItem.qml");
+-        }
+         //Allow the plasmoid expander to know in what window it will be
+         var plasmoidContainer = plasmoidItemComponent.createObject(invisibleEntriesContainer, {"x": x, "y": y, "applet": applet});
+ 
+-- 
+cgit v1.1
+

desktop/kde/plasma/plasma-workspace/pspec.xml

@@ -88,7 +88,7 @@
         </BuildDependencies>
         <Patches>
             <!--dirty fix for qt5.6.0 --> 
-<!--             <Patch level="1">f32002ce50edc3891f1fa41173132c820b917d57.patch</Patch> -->
+            <Patch level="1">390890.patch</Patch>
         </Patches>
     </Source>
 
@@ -290,7 +290,7 @@
 
     <History>
         <Update release="30">
-            <Date>2019-01-12</Date>
+            <Date>2019-01-16</Date>
             <Version>5.14.5</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>