[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     119df0079c9d724de014e7b4a62abb8785933ece
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 25 19:08:14 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 25 19:09:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=119df007

kde-plasma/plasma-workspace: fix QQuickStackElement::initialize null deref

See also:
https://mail.kde.org/pipermail/distributions/2025-September/001617.html

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=509192

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...sma-workspace-6.4.5-QQuickStackView-crash.patch |  43 ++++
 .../plasma-workspace-6.4.5-r1.ebuild               | 224 +++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.4.5-QQuickStackView-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.4.5-QQuickStackView-crash.patch
new file mode 100644
index 000000000000..a4943c9caf17
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.4.5-QQuickStackView-crash.patch
@@ -0,0 +1,43 @@
+From 30273fb2afcc6e304951c8895bb17d38255fed39 Mon Sep 17 00:00:00 2001
+From: Oliver Beard <olib141@outlook.com>
+Date: Tue, 23 Sep 2025 22:37:31 +0100
+Subject: [PATCH] applets/mediacontroller: Workaround for common crash in
+ QQuickStackView
+
+This commit adds a workaround for QTBUG-140018 where a regression in Qt 6.9.2 causes a segfault as qmlEngine(view) returns null in QQuickStackElement::initialize, because a parent loader set the engine to null when unloading, but we still run.
+
+We avoid this by not pushing a new Image to the StackView when it isn't visible, which is coincident with the above and the cause of the crash.
+
+This does not regress any behaviour, functionality or animation.
+
+BUG: 509192
+
+Co-authored-by: David Edmundson <kde@davidedmundson.co.uk>
+---
+ applets/mediacontroller/AlbumArtStackView.qml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/applets/mediacontroller/AlbumArtStackView.qml b/applets/mediacontroller/AlbumArtStackView.qml
+index 08159215cde..69dbd5a101c 100644
+--- a/applets/mediacontroller/AlbumArtStackView.qml
++++ b/applets/mediacontroller/AlbumArtStackView.qml
+@@ -58,6 +58,16 @@ Item {
+         });
+ 
+         function replaceWhenLoaded() {
++            // HACK: Workaround for QTBUG-140018 (see also: BUG 509192)
++            // When a parent loader is inactive, it'll drop the engine from the context, but this can still run
++            // afterwards which causes a crash in QQuickStackElement::initialize which asserts the engine is not null.
++            // This visiblity heuristic is always the case when we're in this state, returning without pushing
++            // anything to the StackView and avoiding the above. Since the artwork is always updated when expanding,
++            // we don't have to worry about not being visible due to other reasons.
++            if (!albumArt.visible) {
++                return;
++            }
++
+             // There can be a potential race: when the previous player is gone but the pending image is just ready in time,
+             // pendingImage.destroy() -> QQuickImage::deleteLater(), so in the event queue statusChanged may be emitted
+             // before pendingImage is deleted, but pendingImage is already set to null when the previous player is gone.
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.4.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.4.5-r1.ebuild
new file mode 100644
index 000000000000..285df668d23b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.4.5-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.16.0
+QTMIN=6.8.1
+inherit ecm plasma.kde.org xdg
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig +ksysguard networkmanager +policykit
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata +X"
+
+REQUIRED_USE="fontconfig? ( X )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,opengl,sql,sqlite,wayland,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtlocation-${QTMIN}:6
+	>=dev-qt/qtpositioning-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kded-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}-r1:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6[qml]
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/breeze-${KDE_CATV}:6
+	>=kde-plasma/kwayland-${KDE_CATV}:6
+	>=kde-plasma/kwin-${KDE_CATV}:6
+	>=kde-plasma/layer-shell-qt-${KDE_CATV}:6
+	>=kde-plasma/libkscreen-${KDE_CATV}:6
+	>=kde-plasma/libplasma-${KDE_CATV}:6
+	>=kde-plasma/plasma-activities-${KDE_CATV}:6
+	>=kde-plasma/plasma-activities-stats-${KDE_CATV}:6
+	>=kde-plasma/plasma5support-${KDE_CATV}:6
+	media-libs/libcanberra
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	sci-libs/libqalculate:=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/libudev:=
+	appstream? ( >=dev-libs/appstream-1[qt6] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+	ksysguard? ( >=kde-plasma/libksysguard-${KDE_CATV}:6 )
+	policykit? ( virtual/libcrypt:= )
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	systemd? ( sys-apps/systemd:= )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+	wallpaper-metadata? ( kde-apps/libkexiv2:6 )
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[X]
+		>=kde-plasma/kscreenlocker-${KDE_CATV}:6
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXtst
+		x11-libs/xcb-util
+		fontconfig? (
+			media-libs/fontconfig
+			x11-libs/libXft
+			x11-libs/xcb-util-image
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.18.0
+	dev-libs/qcoro
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	test? ( screencast? ( >=media-video/pipewire-0.3:* ) )
+	X? (
+		fontconfig? ( x11-libs/libXrender )
+		x11-base/xorg-proto
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/libkworkspace:5
+	!<kde-plasma/plasma-desktop-6.3.80
+	!<kde-plasma/xdg-desktop-portal-kde-6.1.90
+	!kde-plasma/xembed-sni-proxy:*
+	app-text/iso-codes
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qttools-${QTMIN}:*[qdbus]
+	kde-apps/kio-extras:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+	>=kde-plasma/kactivitymanagerd-${KDE_CATV}:6
+	>=kde-plasma/kdesu-gui-${KDE_CATV}:*
+	>=kde-plasma/milou-${KDE_CATV}:6
+	>=kde-plasma/plasma-integration-${KDE_CATV}:6
+	>=kde-plasma/plasma-login-sessions-${KDE_CATV}:6
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	policykit? ( sys-apps/accountsservice )
+	screencast? ( >=media-video/pipewire-0.3:* )
+"
+RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[wayland]
+	>=dev-util/wayland-scanner-1.19.0
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+	test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor(+)] )
+"
+BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${P}-QQuickStackView-crash.patch" # KDE-bug 509192
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory login-sessions
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use fontconfig; then
+		ecm_punt_bogus_dep XCB IMAGE
+		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X) # remember to submit patches with bugs
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+		-DGLIBC_LOCALE_GEN=OFF
+		-DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF6Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package ksysguard KSysGuard)
+		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
+		-DBUILD_CAMERAINDICATOR=$(usex screencast)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+		$(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	xdg_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}