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

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

commit:     3533da6829c3651339941f4dbd192c4519c6708a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 19:27:12 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 19:28:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533da68

kde-plasma/kwin: Fix X11 crash issue

See also:
https://mail.kde.org/pipermail/distributions/2025-February/001560.html

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

 kde-plasma/kwin/files/kwin-6.3.0-crashfix.patch |  29 +++++
 kde-plasma/kwin/kwin-6.3.0-r1.ebuild            | 149 ++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/kde-plasma/kwin/files/kwin-6.3.0-crashfix.patch b/kde-plasma/kwin/files/kwin-6.3.0-crashfix.patch
new file mode 100644
index 000000000000..7d1cef4d4fb3
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.0-crashfix.patch
@@ -0,0 +1,29 @@
+From c97bc26ca9de8b1462f6ccb05fb2dafe01cd82cb Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Sat, 8 Feb 2025 23:39:36 +0800
+Subject: [PATCH] core/outputlayer: guard against null m_output
+
+SENTRY: KWIN-8ZG
+FIXED-IN: 6.3.1
+---
+ src/core/outputlayer.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/outputlayer.cpp b/src/core/outputlayer.cpp
+index f041a8d1d93..9c4aaf2f501 100644
+--- a/src/core/outputlayer.cpp
++++ b/src/core/outputlayer.cpp
+@@ -50,7 +50,9 @@ QRegion OutputLayer::repaints() const
+ void OutputLayer::addRepaint(const QRegion &region)
+ {
+     m_repaints += region;
+-    m_output->renderLoop()->scheduleRepaint(nullptr, nullptr);
++    if (m_output) {
++        m_output->renderLoop()->scheduleRepaint(nullptr, nullptr);
++    }
+ }
+ 
+ void OutputLayer::resetRepaints()
+-- 
+GitLab
+

diff --git a/kde-plasma/kwin/kwin-6.3.0-r1.ebuild b/kde-plasma/kwin/kwin-6.3.0-r1.ebuild
new file mode 100644
index 000000000000..d996b2c9ff3f
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.3.0-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm fcaps plasma.kde.org xdg
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+COMMON_DEPEND="
+	dev-libs/libei
+	>=dev-libs/libinput-1.27:=
+	>=dev-libs/wayland-1.23.0
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=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/kglobalaccel-${KFMIN}:6=[X(+)]
+	>=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/breeze-${KDE_CATV}:6
+	>=kde-plasma/kdecoration-${KDE_CATV}:6
+	>=kde-plasma/kwayland-${KDE_CATV}:6
+	>=kde-plasma/plasma-activities-${KDE_CATV}:6
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libcanberra
+	>=media-libs/libdisplay-info-0.2.0:=
+	media-libs/libepoxy
+	media-libs/libglvnd
+	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libxcb-1.10:=
+	>=x11-libs/libxcvt-0.1.1
+	>=x11-libs/libxkbcommon-1.5.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:6 )
+	gles2-only? ( >=media-libs/mesa-24.1.0_rc1 )
+	lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
+	screencast? ( >=media-video/pipewire-1.2.0:= )
+	shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kdeplasma-addons:5
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
+	sys-apps/hwdata
+	>=x11-base/xwayland-23.1.0[libei]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.16.0
+	>=dev-libs/wayland-protocols-1.38
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	x11-base/xorg-proto
+	x11-libs/xcb-util-image
+	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+# https://bugs.gentoo.org/941628
+# -m 0755 to avoid suid with USE="-filecaps"
+FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+		$(cmake_use_find_package accessibility QAccessibilityClient6)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
+		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	fcaps_pkg_postinst
+}