gentoo resync : 29.01.2021

4 files changed, 96 insertions, 3 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 8e3fe21951df..9606bbdaf26d 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,7 @@
+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
 DIST kirigami2-5.78.0.tar.xz 299628 BLAKE2B 15adf9840618ec9aee218bee34a264c9ea41f87ead46dc3785caa430a25424d972ba80b1053ffd7eb537a0e9fe25d8f00603a0bca348eb21caaf426f1ebab76c SHA512 11789fe6d9cc6c3213e37d47c0dbe6f7cb180e6fadfb16ff461c5d6f60fa896d201694f49984a7db0e44589ff5b7af4772d924641e4aa5d59da4c6f55827285e
+EBUILD kirigami-5.77.0-r1.ebuild 1083 BLAKE2B 32cfc3318ce1dba1a988138a7e20fec7fa2c534bed7e5afaad0886ab319097a9509f592af401fbc79787169f3dffcdbb61a1736d57c545a4198f6d52023f7bac SHA512 ee2408ebcf2be2d312908cbd719cde79dd39305f7bd3669c990480c1d551b8a9668cc976a8ac4cef4df2a55b1ac98d80aab9aacc697b62e435dce93a5949b175
 EBUILD kirigami-5.77.0.ebuild 975 BLAKE2B 581843601075e0596538ddb0bc6bd86844b27b353ad6b3ed454c485f949a42795f98133e22117b81cb2681a8cc558d0cd34a8e23f927b9f612dc31ed2c0071e5 SHA512 cef74f4222bcd56ca0b63085f044d8cae2d5dfefac8f60f926ae62dd11d3f74b07ca2854a3eca44db9ce414fcaf49252178031ce1b5df2ce42eea55f73c9f477
-EBUILD kirigami-5.78.0.ebuild 978 BLAKE2B 61a5d76a6254940582f9713d6017fcc04961d3b7df0216de275d02fccea681843a4bfc8ba608846b2e4f3de40d86bb0bc193ec71851f1811e4ed53764a7f8ac9 SHA512 3f941589dfe8c3f3670d1208736eab20772a0be94453ce9a2fee0dfa14ad24d669b9da07dd253a19c5f3acdc64c8b23fbd0970f96a3c308f43f41244e9a2fbef
+EBUILD kirigami-5.78.0-r1.ebuild 1094 BLAKE2B 4c51e098b599b9cce2d7d1122019b4e8f0d38c358434dde39fdf450adef23b7d3dde6f7869c4cba27abfb34c082e84ccd46039ca7f5ae29fcc75c08250469ca1 SHA512 02a253005533e63e90d7c9806131846efde478c9fb32a43451bcec71f6c19393dcaa9be7809dd514fae0a04c36cfa86eb1f260fe82295b968d60c8f8dc8c7cc4
 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
new file mode 100644
index 000000000000..5bda9da38249
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
@@ -0,0 +1,35 @@
+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/kirigami-5.77.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
new file mode 100644
index 000000000000..bbe9de249552
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+PATCHES=(
+	# KDE-Bugs #428461, #431419
+	"${FILESDIR}/${P}-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
index cf073175ace8..e44584cc323e 100644
--- a/kde-frameworks/kirigami/kirigami-5.78.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
@@ -18,6 +18,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# requires package to already be installed
+RESTRICT+=" test"
+
 BDEPEND="
 	>=dev-qt/linguist-tools-${QTMIN}:5
 "
@@ -34,8 +37,10 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 "
 
-# requires package to already be installed
-RESTRICT+=" test"
+PATCHES=(
+	# KDE-Bugs #428461, #431419
+	"${FILESDIR}/${PN}-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(