gentoo resync : 25.04.2020

3 files changed, 64 insertions, 1 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index fc154aaee553..171c461868ec 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,8 @@
 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
+AUX plasma-5.69.0-qt-5.15-crash.patch 2193 BLAKE2B 2c5d8faee8268c2f6134e2298e643fbc7767faff86efb034cba5e4b05635dccb557f90c2b3b871a339f6d3071392705676823dba11657517ef96768a61b6a56f SHA512 354b5b6c4f910202015d539704e014843ede248cd504e0b14664b101944943965d77bf45b741ad87ed5fc6df702c5a6769c24ab22bd61d2bda7001cf5440aeba
 DIST plasma-framework-5.67.0.tar.xz 3127592 BLAKE2B 15eabb6b3c62117ee64a8ceb2c6cee9d1df29942785b5e0e061f062e4ddc5cedb0ea73ea17e597bb09a5eef868cb8aafe81a25d51af19691f05152d05b916f8d SHA512 3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92
 DIST plasma-framework-5.69.0.tar.xz 3130816 BLAKE2B bfb86c96aa600d02c75a52c990784e001c29eb517f504162e2cfe68ea1d2f17a9eea61a9da03715c713a3ac588640a130708cdda02693467d57ac95fab1975f0 SHA512 37fcd4c3bb531e72616a3f128342a470e9a938b9e99012dcda89e99d8eca6a856b48bf050794b1cae561fd3006d7189a0711b172d6982fc7a5c2813bcf7048a6
 EBUILD plasma-5.67.0-r3.ebuild 2091 BLAKE2B f54d8025715f9820f8fc8fb32e50fca3c7c945391ea8ac3b27e6db5f23708e7b453ce582388a77991ed455ddbc0957e992b631445a06ada00f5064ac054254ec SHA512 81a9dc4a48d6d634dabee6641a732f99844bf38d6667a3fff070bd7a521e4b7a22968ed7e574893c653e2652002dd38a036a719563f5bed05f4e773c6d53de53
-EBUILD plasma-5.69.0.ebuild 1930 BLAKE2B b394277d5f614c5a7aa3d5f56aa26bb2d574b1140e7c58f879fd1f5bb7950229588922a6e2875a242a9bcd9132e99f77f1380fb1f3de5eff76ae3b2b29db25e4 SHA512 3ad4bfe0936337f683ac315ed09970af196e3c8be54183d0dba3917e336b0792d9b620de377f7b006073ed65a6b99c864da9550491b1e9aaac711a9cb87d30c8
+EBUILD plasma-5.69.0-r1.ebuild 1982 BLAKE2B 9fde274078d88b4ddd56ac7332e37f26387f5d4d3d6d8eea1c838e30f03ca52541c3d3ded85b0e8d537671d6d0a2943aa7c9ccbe0290a43de01126c0b41fd106 SHA512 21011fcf09f0d96e6add8624dc4387f68d1ac3a2154aa2d2ae01cf6433b9fcce0b445592553e7dddd713cda54b07c1ac9612252a9e7981b621c3776f7d80d894
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
new file mode 100644
index 000000000000..f48b82f72234
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
@@ -0,0 +1,60 @@
+From 0417bf61d53a61879702aa6e5bc64d1da557db27 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Mon, 6 Apr 2020 12:21:45 +0100
+Subject: [configview] Simplify code / workaround Qt5.15 crash
+
+Summary:
+QQmlComponent::beginCreate and completeCreate are useful if you need to
+set properties on the object explicitly. We're not doing that here, we
+can just call create.
+
+Test Plan:
+On Qt5.15
+Right click a panel
+choose edit
+
+Reviewers: #plasma, apol
+
+Reviewed By: apol
+
+Subscribers: apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D28599
+---
+ src/plasmaquick/configview.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp
+index ff43753..c5e2228 100644
+--- a/src/plasmaquick/configview.cpp
++++ b/src/plasmaquick/configview.cpp
+@@ -134,9 +134,13 @@ void ConfigViewPrivate::init()
+ 
+     q->setResizeMode(QQuickView::SizeViewToRootObject);
+ 
++    auto plasmoid = applet.data()->property("_plasma_graphicObject").value<QObject *>();
++    q->engine()->rootContext()->setContextProperties({QQmlContext::PropertyPair{QStringLiteral("plasmoid"), QVariant::fromValue(plasmoid)},
++                                                                                                  QQmlContext::PropertyPair{QStringLiteral("configDialog"), QVariant::fromValue(q)}});
++
+     //config model local of the applet
+     QQmlComponent *component = new QQmlComponent(q->engine(), applet.data()->kPackage().fileUrl("configmodel"), q);
+-    QObject *object = component->beginCreate(q->engine()->rootContext());
++    QObject *object = component->create(q->engine()->rootContext());
+     configModel = qobject_cast<ConfigModel *>(object);
+ 
+     if (configModel) {
+@@ -172,9 +176,6 @@ void ConfigViewPrivate::init()
+         }
+     }
+ 
+-    q->engine()->rootContext()->setContextProperty(QStringLiteral("plasmoid"), applet.data()->property("_plasma_graphicObject").value<QObject *>());
+-    q->engine()->rootContext()->setContextProperty(QStringLiteral("configDialog"), q);
+-    component->completeCreate();
+     delete component;
+ }
+ 
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/plasma/plasma-5.69.0.ebuild b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
index 5ec5f22228ae..7d9816e22771 100644
--- a/kde-frameworks/plasma/plasma-5.69.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
@@ -62,6 +62,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15-crash.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)