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 3A18A1381F3 for ; Fri, 17 Apr 2020 20:59:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6275E0841; Fri, 17 Apr 2020 20:59:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B6D6BE0841 for ; Fri, 17 Apr 2020 20:59:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A63C134F11A for ; Fri, 17 Apr 2020 20:59:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B11D1E2 for ; Fri, 17 Apr 2020 20:59:22 +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: <1587157126.217c7b8085ffb5ce72873dab745e18074ef5f856.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch kde-frameworks/plasma/plasma-5.69.0-r1.ebuild X-VCS-Directories: kde-frameworks/plasma/ kde-frameworks/plasma/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 217c7b8085ffb5ce72873dab745e18074ef5f856 X-VCS-Branch: master Date: Fri, 17 Apr 2020 20:59:22 +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: fab97eea-8013-407a-ad58-d564b014e26c X-Archives-Hash: 753aca46ce5f45f66dba8073137e4633 commit: 217c7b8085ffb5ce72873dab745e18074ef5f856 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 20:22:33 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 20:58:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217c7b80 kde-frameworks/plasma: Fix crash w/ Qt-5.15 on panel right click Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma/files/plasma-5.69.0-qt-5.15-crash.patch | 60 +++++++++++++++++ kde-frameworks/plasma/plasma-5.69.0-r1.ebuild | 77 ++++++++++++++++++++++ 2 files changed, 137 insertions(+) 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 00000000000..f48b82f7223 --- /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 +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(); ++ 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(object); + + if (configModel) { +@@ -172,9 +176,6 @@ void ConfigViewPrivate::init() + } + } + +- q->engine()->rootContext()->setContextProperty(QStringLiteral("plasmoid"), applet.data()->property("_plasma_graphicObject").value()); +- q->engine()->rootContext()->setContextProperty(QStringLiteral("configDialog"), q); +- component->completeCreate(); + delete component; + } + +-- +cgit v1.1 + diff --git a/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild new file mode 100644 index 00000000000..7d9816e2277 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_ORG_NAME="${PN}-framework" +PVCUT=$(ver_cut 1-2) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="gles2-only wayland X" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 +BDEPEND=" + >=kde-frameworks/kdoctools-${PVCUT}:5 +" +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kactivities-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kdeclarative-${PVCUT}*:5 + =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kirigami-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kpackage-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + !gles2-only? ( virtual/opengl ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/mesa[egl] + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + x11-libs/libxcb + ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-qt-5.15-crash.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland KF5Wayland) + $(cmake_use_find_package X X11) + $(cmake_use_find_package X XCB) + ) + + ecm_src_configure +}