gentoo resync : 25.04.2020

10 files changed, 140 insertions, 9 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f1bedfcb43fa..b1a3b5ba288e 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 88c3139df503..f7d5bd290942 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,6 @@
+AUX kbookmarks-5.69.0-konqbookmarkmenu.patch 2193 BLAKE2B ebc499bf54b94f4ccbf754670085ef253f8684ff48998b29da734e3a547c21f7b6b826acc778be8ead0f506aa18adae70ed09ea6c7b873ccd5cf59c5ccbdae6c SHA512 7e41a7e1418b71af2b0384924560dd46212286822076b18faec964577aadf00bbe83056cfe209ca61869e0b22b6d832181b4ea22fb7c2f1c809d5aa92756cb8d
 DIST kbookmarks-5.67.0.tar.xz 120776 BLAKE2B 67cc22431d9ef75d6a0c7239a39cc40e9db2d941185ffdd96f0085c0f419569885cee8efe65f21214fb6188ff96bc52d26e0d2fe4b1b18fb9ba99920aa3d74d7 SHA512 3ab71f193e3acf2bd0074d3e20e38c9cc3ee9aec207d59b06cb8f7d160b40337d5473f29afd1fec17f0af0d82abd8b31821f46991734ae8906c5fd6aa926e066
 DIST kbookmarks-5.69.0.tar.xz 121596 BLAKE2B 8a04dedb7eefc048ca4061521825e4eceb5f8c29bcbe08fb976ae3bb2060fb7fd525f171d15584a5b14481b5958e18e260e7cf8cf68f8638b6bccd3a39b366dc SHA512 9c13e15f63ac65215fb0517b781fc217f1e7fc4756a3faca1ce12a9de8cdf5d08094fce5a6dfddaacfe6a9718ba2f47ffce72b690a7903ab726af6e13056ec5a
 EBUILD kbookmarks-5.67.0.ebuild 816 BLAKE2B 3677f8fcd6ad7aa5621b93a4db5e5385956ee17a99aa3bc83518c6016c6ec15d9c49663a9abea7385702b655c1f4113970b34b3384b614ff04054dd473b576c1 SHA512 c3102d9ae062e022fa912a94605be1df8c99574230eec5d0fb5a520c405f5fe583c89f8a60508182787385a44e4ca7cc71530e688d3fc375f3c6e6efb65c1a19
-EBUILD kbookmarks-5.69.0.ebuild 819 BLAKE2B 2e90327e63dd218733f881b022bbe6dc7937ac56a0cb7f399cf48f6e7e55eae057b7d544d2d0c74be89bf6d1da2685c9386f3d612c3337405c8b91c359f4c83f SHA512 f89a5867e5b262da93ad39350b3b0ffb110ba322cc70a06313bbde72755ec257cc9291fd306f6be163800b6ccb5ba268866fcb0bfad817a35a05ec02c22ed123
+EBUILD kbookmarks-5.69.0-r1.ebuild 874 BLAKE2B 6e926f785f0868f1fe762668dd613782edb8f229109a1d58358793c488b41683aeb8b23d30c25c2d4a76b90902f56828325b77b51b70c9908af5dbef0deb1bb4 SHA512 444af9a0720747308e622b9ba95b3e520c144a6611baae7770e1332ad0090124442d07e90a5412b42c84e094afff694073edc74e3cae5bf3d6ed96f26ebb4885
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
new file mode 100644
index 000000000000..c0e68bc8427c
--- /dev/null
+++ b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
@@ -0,0 +1,67 @@
+From 8504e095478b1c922055fc4ae6c736472708fddd Mon Sep 17 00:00:00 2001
+From: Stefano Crocco <stefano.crocco@alice.it>
+Date: Mon, 13 Apr 2020 10:53:06 +0200
+Subject: [PATCH] Fix crash due to changes in KBookmarkMenu
+
+Summary:
+Since version 5.69, KBookmarkMenu doesn't automatically create an action
+collection. This causes Konqueror to crash when going on a submenu in
+the Bookmarks menu. To avoid it, manually create the action collection.
+
+Also, avoid calling the version of KBookmarkMenu construction which
+takes a KActionCollection, as it's deprecated.
+
+Test Plan:
+Open the bookmarks menu and hover with the mouse on a submenu. Check
+that it crashes. Do the same after this change and check it doesn't crash
+anymore.
+
+Reviewers: dfaure, nicolasfella
+
+Reviewed By: nicolasfella
+
+Subscribers: poboiko
+
+Differential Revision: https://phabricator.kde.org/D28789
+
+* asturm, 2020-04-23: This *is* KF-5.69 so no need to check for the
+  version wrt commit b61086cf.
+---
+ src/konqbookmarkmenu.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h
+index 4898c3a..45bdb84 100644
+--- a/src/konqbookmarkmenu.h
++++ b/src/konqbookmarkmenu.h
+@@ -25,6 +25,8 @@
+ #include "kbookmarkactionmenu.h"
+ #include "kbookmarkcontextmenu.h"
+ 
++#include <KActionCollection>
++
+ #if KBOOKMARKS_ENABLE_DEPRECATED_SINCE(5, 0)
+ #include "kbookmarkowner.h" // for SC reasons
+ 
+@@ -56,8 +58,9 @@ public:
+      */
+     KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror")
+     KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec)
+-        : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec)
++        : KBookmarkMenu(mgr, owner, parentMenu->menu())
+     {
++        m_actionCollection = collec;
+     }
+     ~KonqBookmarkMenu() override
+     {}
+@@ -71,6 +74,7 @@ public:
+     KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress)
+         : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress)
+     {
++        m_actionCollection = new KActionCollection(this);
+     }
+ 
+ protected:
+-- 
+2.26.2
+
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.69.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
index 7e87675a28d2..886f2635f73a 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.69.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
@@ -32,3 +32,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-konqbookmarkmenu.patch" )
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 12db330eaf22..919609635a6d 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.67.0.tar.xz 339916 BLAKE2B d1a4758c733fdb6af84f86789561fd1212a13e7a4f77dae11461c6a2f9018a89973e8ec1fa3e85f07edebcdc3acf28cd75c88135961400ee1bdc828a6acc8a14 SHA512 4f8c4aa2b9faba02b4198cec3c787bfb7e8da6133123146d9c8bac3f20dc9ceb4cc136260dc3af7408e52561156ebf09c67ea62f2551b11a1991e24a72ae0121
 DIST kwayland-5.69.0.tar.xz 346224 BLAKE2B d166c74771673146e783e6fc55ebd7915079641548afb18d0a97d1fc619e78727a093a33ae65f182a7cc3fa6daf4b7ef2260d5aadec45747cdea2e0b7c4d48a4 SHA512 e1931969ad7cd2d9af45d5dc9cdadd2517a7a4109ac143c7405a0132601fc822043a540e916d26bdbcb109daf2888699d9a57a781853f1e37518b9e9cb18304a
-EBUILD kwayland-5.67.0.ebuild 705 BLAKE2B 2ca0123df648e10334285e8cb370eb05a5837bef3380ecb3fa0e5de68cf935c66f276ba0ac0cdfc45e4ae4095a062bd6b82154fe52745606dd298f3169acb427 SHA512 08fb9acfc4a8850fc4436e7c8534daf3ac8445949c2fdf36649552b94767def7f8e4e4a9745dc52a3d148d5ad9d0739a7159754f82ad0d80b32b9d76e2afe148
-EBUILD kwayland-5.69.0.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
+EBUILD kwayland-5.67.0.ebuild 665 BLAKE2B a890279b9b5eb5d0ada528ade416e80ea1cd980a0ee29b8c3771976a3ee12bcba3ab5a0180fef6ff0b257a0b0779b347fc94d97125c0a41737ffea39866c142e SHA512 23c84c2a496571ace0745b793a2db486e004a0127929e6c84edad93286f1fc1a04a1e27180430f315404aac2e306d51dca15cf6fea00f50ba5c9b0f09b48398e
+EBUILD kwayland-5.69.0-r1.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.67.0.ebuild b/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
index 67d9b40b80da..6c3425656e54 100644
--- a/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
@@ -15,18 +15,16 @@ LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-libs/wayland-1.15.0
 	media-libs/mesa[egl]
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-libs/wayland-protocols-1.15
 "
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtwayland-${QTMIN}:5
-"
 
 # All failing, I guess we need a virtual wayland server
 RESTRICT+=" test"
diff --git a/kde-frameworks/kwayland/kwayland-5.69.0.ebuild b/kde-frameworks/kwayland/kwayland-5.69.0-r1.ebuild
index 62e01942123b..62e01942123b 100644
--- a/kde-frameworks/kwayland/kwayland-5.69.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.69.0-r1.ebuild
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)