kde-plasma/plasma-workspace: add 5.27.9.1

Additional backports over upstream's point release:
- kcms/region_language: Fix check for GLIBC_LOCALE
- Reset KSMClient state even when logout is cancelled
- kcms/nightcolor: Fix nightcolor with automatic location

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

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

5 files changed, 339 insertions, 0 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 32719af4b3fb..6a64313fd8ff 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.27.8.tar.xz 19465764 BLAKE2B 61ac21353482ad7eea4de975be83755d4feed2ff1bb188f4b1b8e333c8aac8469691017c1c394eec90fdbd8cc44ad1015dccc0cb74fae5a249ee6c832b02b05b SHA512 d75da7d8cea3124f921813643ebda333376d3cc2ecbe2aaeee86e54a828e6a9767fa84b76991cfe282efdbf583abebee4a0bfe54a6b590c184ceb3d2995e9fcb
+DIST plasma-workspace-5.27.9.1.tar.xz 19468088 BLAKE2B 23244e093bbae33adb5aad2572566e53ad436b4eacf4f4439f3acdb923aeaade65758672a2951b3ad2a0a0e52f24901f79220d7050c0a0b7bfc4a0a7335588f3 SHA512 6aa1e69bba9b293646d5d2c819ec8ab1ba8b82b3a050f7122cdfa8c3580bffe8a7fe1e6422bb0f6e87d716df609e5fd49f2e20ebbe7296e43663eeca6d897442
 DIST plasma-workspace-5.27.9.tar.xz 19467152 BLAKE2B 8b88c2a65f2a8c3b1e0d93b1b3b805685afbd75117e218ab1ae8cfa4ea143d0cfff50fdd96c3355aea436d186b81df2ec7632f28cb4666f21bfc6d7b247e4f87 SHA512 11eefc03fa4e327454d13d873a3c4fbdaa6fc9a1ad0033d16986d31bf313005bd47dff2948f97aab801837620f9631f5e96acca3348491ee95486bdfbbbe3cc2
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch
new file mode 100644
index 000000000000..0dee8bce65f5
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-GLIBC_LOCALE-check.patch
@@ -0,0 +1,28 @@
+From 292822e16ada9122594ac2c8573633e5a50e63dd Mon Sep 17 00:00:00 2001
+From: Gleb Popov <6yearold@gmail.com>
+Date: Tue, 24 Oct 2023 22:03:20 +0300
+Subject: [PATCH] kcms/region_language: Fix check for GLIBC_LOCALE.
+
+The GLIBC_LOCALE_AUTO is created by the #cmakedefine01 directive and thus is
+always defined.
+
+(cherry picked from commit 196966b02bf40a971bdf8888a2fa8ba7db0106f1)
+---
+ config-workspace.h.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
+index b696cd8fa5..e05f1c9749 100644
+--- a/config-workspace.h.cmake
++++ b/config-workspace.h.cmake
+@@ -15,6 +15,6 @@
+ #cmakedefine01 GLIBC_LOCALE_AUTO
+ #cmakedefine01 GLIBC_LOCALE_GENERATED
+ 
+-#if defined(GLIBC_LOCALE_AUTO) || defined(GLIBC_LOCALE_GENERATED)
++#if GLIBC_LOCALE_AUTO == 1 || GLIBC_LOCALE_GENERATED == 1
+ #define GLIBC_LOCALE
+ #endif
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch
new file mode 100644
index 000000000000..17286608fc8d
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-fix-nightcolor-autolocation.patch
@@ -0,0 +1,47 @@
+From b8544fc070e88614feb9c198f6ea910c91f3c5d5 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Mon, 6 Nov 2023 19:13:37 +0000
+Subject: [PATCH] kcms/nightcolor: Fix nightcolor with automatic location
+
+As it turns out that the UI never send the geo-location to the
+backend so backend always fallbacks to (0, 0) lat and lon
+coordinates unless manually changed by `qdbus` commad..
+
+BUG: 469730
+FIXED-IN: 5.27.10
+
+
+(cherry picked from commit cb2b0e9c036d844d87fd104a3ae031b59243eaa5)
+---
+ kcms/nightcolor/package/contents/ui/main.qml | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml
+index c7d237f13b..418c05d42f 100644
+--- a/kcms/nightcolor/package/contents/ui/main.qml
++++ b/kcms/nightcolor/package/contents/ui/main.qml
+@@ -60,6 +60,21 @@ KCM.SimpleKCM {
+         }
+     }
+ 
++    // Update backend when locator is changed
++    Connections {
++        target: locator
++        function onLatitudeChanged() {
++            if (root.doneLocating) {
++                kcm.nightColorSettings.latitudeAuto = locator.latitude
++            }
++        } 
++        function onLongitudeChanged() {
++            if (root.doneLocating) {
++                kcm.nightColorSettings.longitudeAuto = locator.latitude
++            }
++        }
++    }
++
+     header: ColumnLayout{
+         Kirigami.InlineMessage {
+             id: errorMessage
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch
new file mode 100644
index 000000000000..26a35bba5c91
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.9-reset-KSMClient-state.patch
@@ -0,0 +1,29 @@
+From 6e88325d25c06d3e8fdca49d13dd5a6d5ccefc0c Mon Sep 17 00:00:00 2001
+From: xiaofeng zhou <rpg2010@yeah.net>
+Date: Wed, 1 Nov 2023 18:14:22 +0000
+Subject: [PATCH] Reset KSMClient state even when logout is cancelled
+
+Now the KSMClient state is properly reset when a log out is canceled, preventing some funny business
+when the state is not cleared. For example inside of KSMServer::handlePendingInteractions, when it
+checks if a client has pending interactions.
+
+(cherry picked from commit b5b2c757e98511a7eb6c56b9e009e98f0e132c26)
+---
+ ksmserver/logout.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ksmserver/logout.cpp b/ksmserver/logout.cpp
+index f267338860..fb912714ba 100644
+--- a/ksmserver/logout.cpp
++++ b/ksmserver/logout.cpp
+@@ -346,6 +346,7 @@ void KSMServer::cancelShutdown(KSMClient *c)
+                 if (!discard.isEmpty())
+                     executeCommand(discard);
+             }
++            c->resetState();
+         }
+     }
+     state = Idle;
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild
new file mode 100644
index 000000000000..97b1871d3410
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.9.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	sci-libs/libqalculate:=
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	fontconfig? (
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	policykit? (
+		sys-auth/polkit-qt
+		virtual/libcrypt:=
+	)
+	screencast? (
+		>=dev-qt/qtgui-${QTMIN}:5=[egl]
+		>=kde-plasma/kpipewire-${PVCUT}:5
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+	>=dev-libs/wayland-protocols-1.31
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.27.0:5
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:*
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	kde-apps/kio-extras:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${PN}-5.27.9-fix-GLIBC_LOCALE-check.patch"
+	"${FILESDIR}/${PN}-5.27.9-fix-nightcolor-autolocation.patch"
+	"${FILESDIR}/${PN}-5.27.9-reset-KSMClient-state.patch" # KDE-bug 469730
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		ecm_punt_bogus_dep KPipeWire
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		-DGLIBC_LOCALE_GEN=$(usex policykit)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+		$(cmake_use_find_package wallpaper-metadata KF5KExiv2)
+	)
+
+	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 () {
+	ecm_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"
+}