gentoo resync : 28.04.2021

5 files changed, 47 insertions, 42 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 32528e88ee3b..2908c65e2b42 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,6 +1,6 @@
-AUX kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch 1253 BLAKE2B 5b2711b4d853f6966d91c07ad33d36aeeacbe523166e3f16587f6ef0d16bc93f67dd1a4c62d79bc9969354aba28490b4690e047407c953971f09813329afaacb SHA512 7c846700da32d118d2662560760cd2d662856bed1a0c353b39fa25785cb18ab97614bfb599c1bff6208662bdd8b6270519e9b739a12d7785c1b4d49ffb046508
-DIST kirigami2-5.77.0.tar.xz 297028 BLAKE2B b75781fb89b3feec655fb6bc288e0c9ccdfc04d8a507c307001fdfd3c18a7204e4ea75be906d3f36595c12831d2d85b847a5fbf7e795d9b71289b305c27bbf83 SHA512 06e68f649f4cb93606eba2d0e726c004339a5410d5f559184c80e904841952af422d44db663add1144be626c4ac8b5f26eee2df8e0327d51b473027838be5bd6
+AUX kirigami-5.80.0-fix-crash-in-SizeGroup.patch 1285 BLAKE2B aba017ffe7ecbad6e681af81c5584e0e6ae3264753edd738919692e3d9c08ef08881a2ee6bed234d4282a8aa1d55e63bafe214826e8bcd205c983f835c890cf2 SHA512 f742e78b23c8f0ddc127271a5a97fe2aba072585dc193dd7d4d47d08f682a9d3d02705ad1db21605f5ea8e65854914c06296ddbd655ccf61e94c7314a8b75822
 DIST kirigami2-5.80.0.tar.xz 310608 BLAKE2B 3e3ad3190306ffc955c17ed783d6d231f7b5d37314bbc6a8a215c22d2cd0a13564b914ca7c482ad60dd1e54336f1af5833a6af7881d94cf584753007d7052ac5 SHA512 d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
-EBUILD kirigami-5.77.0-r1.ebuild 1083 BLAKE2B 32cfc3318ce1dba1a988138a7e20fec7fa2c534bed7e5afaad0886ab319097a9509f592af401fbc79787169f3dffcdbb61a1736d57c545a4198f6d52023f7bac SHA512 ee2408ebcf2be2d312908cbd719cde79dd39305f7bd3669c990480c1d551b8a9668cc976a8ac4cef4df2a55b1ac98d80aab9aacc697b62e435dce93a5949b175
-EBUILD kirigami-5.80.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
+DIST kirigami2-5.81.0.tar.xz 314848 BLAKE2B c2ea95d5e3595eb849222e324d276366e558d813a5df4ad1260f00c12604b4084806db3d75f696321c6557620601076049ea677b8a444b20dc35327b8b5628ee SHA512 b3511c69ec315a3a78502d19f89067c61fabc381b3d26589ffe44e8070f86d0c4432699a182ebed8dfa19db38bfed06874629b425266af39a8b93ef6c9a31a6d
+EBUILD kirigami-5.80.0-r1.ebuild 1055 BLAKE2B c2735fe93ef85962307a7bbdc39e16ec692b99dd24758418b82dd70c032914a3f7d2ec8cdd7da1f375e297c1cd45694588123d774c899155795c2954a362c6f2 SHA512 3535f0f27146781ef88f35f68db256b6df96b5cf9f74b18d6195639d33fe150e45a288ffd4debe152fefe902c373c83d2dc0cadc5cc0323d6611859561daef30
+EBUILD kirigami-5.81.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
deleted file mode 100644
index 5bda9da38249..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b4a6c562cde4e064494e261bc3f64000cbf628a5 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 14 Jan 2021 15:23:39 +0100
-Subject: [PATCH] Don't manually call reverseTwinsChanged when destructing
- FormLayout
-
-This line causes a crash when destructing the screenlocker KCM.
-It doesn't seem to be caused by reverseTwinsChanged itself but rather by
-accessing the Qt object. I don't fully undestand the root cause.
-
-However the call itself appears to be unnecessary since in the line
-above we write to reverseTwins and that triggers the changed signal if
-needed.
-
-BUG: 431419
-BUG: 428461
----
- src/controls/FormLayout.qml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
-index 74292fda..a27903f2 100644
---- a/src/controls/FormLayout.qml
-+++ b/src/controls/FormLayout.qml
-@@ -84,7 +84,6 @@ Item {
-     Component.onDestruction: {
-         for (let i in twinFormLayouts) {
-             twinFormLayouts[i].children[0].reverseTwins = twinFormLayouts[i].children[0].reverseTwins.filter(function(value, index, arr){ return value != root;})
--            Qt.callLater(() => twinFormLayouts[i].children[0].reverseTwinsChanged());
-         }
-     }
-     GridLayout {
--- 
-GitLab
-
diff --git a/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch b/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch
new file mode 100644
index 000000000000..7d13d2fa1bfa
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch
@@ -0,0 +1,41 @@
+From 29dabab2f536827bc1ecec63f5a0b0a76f0809e5 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Tue, 9 Mar 2021 14:30:44 +0000
+Subject: [PATCH] Fix potential crash in SizeGroup
+
+SizeGroup keeps a cache of a list of items, and when one updates does
+calculations based on all items.
+
+This list is stored as a list of QPointers as we don't explicitly track
+deletion.
+
+We have a list of items and guard for deletion, but they're QML owned.
+So there's a point in time when it's pending deletion with the garbage
+collector but the lower level object isn't managed by an engine.
+
+As we go via QQmlProperty(item, QStringLiteral("Layout.preferredWidth"),
+qmlContext(item)).write(maxWidth) this is problematic.
+
+BUG: 434079
+---
+ src/sizegroup.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sizegroup.cpp b/src/sizegroup.cpp
+index 2035b6eb..a9a0ebf8 100644
+--- a/src/sizegroup.cpp
++++ b/src/sizegroup.cpp
+@@ -98,6 +98,10 @@ void SizeGroup::adjustItems(Mode whatChanged)
+             continue;
+         }
+ 
++        if (!qmlEngine(item)) {
++            continue;
++        }
++
+         switch (m_mode) {
+         case Mode::Width:
+             QQmlProperty(item, QStringLiteral("Layout.preferredWidth"), qmlContext(item)).write(maxWidth);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
index bbe9de249552..6190075bd2a2 100644
--- a/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
@@ -7,7 +7,7 @@ ECM_EXAMPLES="true"
 ECM_QTHELP="false"
 ECM_TEST="true"
 KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
@@ -38,8 +38,7 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	# KDE-Bugs #428461, #431419
-	"${FILESDIR}/${P}-no-reverseTwinsChanged-destr-FormLayout.patch"
+	"${FILESDIR}/${P}-fix-crash-in-SizeGroup.patch" # KDE-bug #434079
 )
 
 src_configure() {
diff --git a/kde-frameworks/kirigami/kirigami-5.80.0.ebuild b/kde-frameworks/kirigami/kirigami-5.81.0.ebuild
index 22c5683da45e..22c5683da45e 100644
--- a/kde-frameworks/kirigami/kirigami-5.80.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.81.0.ebuild