From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAE6D138359 for ; Tue, 29 Sep 2020 12:49:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B488FE0898; Tue, 29 Sep 2020 12:49:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77A0AE0898 for ; Tue, 29 Sep 2020 12:49:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7427B33FEDE for ; Tue, 29 Sep 2020 12:49:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8DD138D for ; Tue, 29 Sep 2020 12:49:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1601383568.262b19e8713abd4fa1fd19c202088af7992d0c15.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/, kde-frameworks/kirigami/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild X-VCS-Directories: kde-frameworks/kirigami/files/ kde-frameworks/kirigami/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 262b19e8713abd4fa1fd19c202088af7992d0c15 X-VCS-Branch: master Date: Tue, 29 Sep 2020 12:49:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 75969620-e046-4625-aff0-a2dd669d965e X-Archives-Hash: f8026d6beb5c19955c3fd038df8f1c59 commit: 262b19e8713abd4fa1fd19c202088af7992d0c15 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 29 12:36:54 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 29 12:46:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=262b19e8 kde-frameworks/kirigami: Remove actions/delegates from ToolBarLayout ...when they get destroyed. Fixes (at least) a Discover crash. Upstream commit 6eaefba5001445fa7e198e4caa0bde738240d66f KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=425670 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> ...actions-from-ToolBarLayout-when-destroyed.patch | 40 ++++++++++++++++++++++ kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild | 5 ++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch new file mode 100644 index 00000000000..192ba9dcf67 --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch @@ -0,0 +1,40 @@ +From 6eaefba5001445fa7e198e4caa0bde738240d66f Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra +Date: Wed, 9 Sep 2020 13:00:59 +0200 +Subject: [PATCH] Remove actions and delegates from ToolBarLayout when they get + destroyed + +Otherwise we're keeping around stale entries that no longer point to +valid stuff. + +BUG: 425670 +--- + src/toolbarlayout.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/toolbarlayout.cpp b/src/toolbarlayout.cpp +index cbf31062..c2df5998 100644 +--- a/src/toolbarlayout.cpp ++++ b/src/toolbarlayout.cpp +@@ -112,6 +112,18 @@ void ToolBarLayout::addAction(QObject* action) + d->actions.append(action); + d->actionsChanged = true; + ++ connect(action, &QObject::destroyed, this, [this](QObject *action) { ++ auto itr = d->delegates.find(action); ++ if (itr != d->delegates.end()) { ++ d->delegates.erase(itr); ++ } ++ ++ d->actions.removeOne(action); ++ d->actionsChanged = true; ++ ++ relayout(); ++ }); ++ + relayout(); + } + +-- +GitLab + diff --git a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild index aa5b71a3f17..0064f84f415 100644 --- a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild +++ b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild @@ -37,7 +37,10 @@ RDEPEND="${DEPEND} # requires package to already be installed RESTRICT+=" test" -PATCHES=( "${FILESDIR}"/${P}-revert-fix-avatar-loading.patch ) +PATCHES=( + "${FILESDIR}"/${P}-revert-fix-avatar-loading.patch + "${FILESDIR}"/${P}-remove-actions-from-ToolBarLayout-when-destroyed.patch +) src_configure() { local mycmakeargs=(