kde-plasma/kwin: Pick more 6.2 branch fixes, fix -r1 regression

Pending upstream MR:
https://invent.kde.org/plasma/kwin/-/merge_requests/6816

Xaver Hugl (4):
      plugins/screencast, screenshot: switch color transforms to relative colorimetric
      outputconfigurationstore: fix choosing the default mode
      layers: add null check
      backends/drm: don't set the dpms mode to AboutToTurnOff if the screen is already off

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

2 files changed, 157 insertions, 0 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 59df79412c4e..36cfb387c618 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946
 DIST kwin-6.2.3-patchset-1.tar.xz 8668 BLAKE2B b8f9c602f94d883a72f5b688826d74504407fa68801e5b7a1689b576b0040cb6865df2d6e9ec1cd85550618f1bae82ba5ae4f40dc3a56a5301f6aae9fe360159 SHA512 0903dd7bea87e6a6ad76681b5311dd0e414d76aab9bea22eebe7ae04257539a38a4639e6a788eac25e39e0195a1b76df46774db023135e0c4a9d69b2a0effd3b
+DIST kwin-6.2.3-patchset-2.tar.xz 10460 BLAKE2B 9b2cb40491e56481bed668b8fb835e1ca1ec84ba4eda11332c8c397768e63a557648c262a2721ab52c21290dc00992f3a85761a90593280635af63d596bdbcb7 SHA512 e2be5d524826f77d7313e2584d08e405154b9ebaf3ddeb1ccf826c9de60e497bbd3b042cec2290f242712934877c46315570ce6f4d9aa7769b8a9740312e437c
 DIST kwin-6.2.3.tar.xz 8557808 BLAKE2B a66c09459b6d41bb7059ae085bc89dc4d8cf08bb61eacb4ab52166863f5c4b971d56e420a295d2f638b30886ad5f2fa1f0f4a725087d0295668158523866648c SHA512 5f54de7536c0bf8c324c8f319614895e279ce888326fdd440b9ac952ea43498c65b532c03920d49605afa31665c7bcd3a66ae637f68eb9d3e1b0ec80ac8c4691
diff --git a/kde-plasma/kwin/kwin-6.2.3-r2.ebuild b/kde-plasma/kwin/kwin-6.2.3-r2.ebuild
new file mode 100644
index 000000000000..9792c992d8c7
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.2.3-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PATCHSET="${P}-patchset-2"
+KFMIN=6.6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm fcaps plasma.kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~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.19:=
+	>=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-${PVCUT}:6
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libcanberra
+	media-libs/libdisplay-info:=
+	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[opengl]
+		<media-libs/mesa-24.1.0_rc1[gles2]
+	) )
+	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
+	screencast? ( >=media-video/pipewire-0.3.65:= )
+	shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}: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-${PVCUT}:6[wayland(+)]
+	sys-apps/hwdata
+	x11-base/xwayland[libei]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.14.0
+	>=dev-libs/wayland-protocols-1.36
+	>=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-${PVCUT}: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 )
+
+# KDE-bugs #494930, #495537, #495400, #495325, #493934, #488941
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+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() {
+	ecm_pkg_postinst
+	fcaps_pkg_postinst
+}