commit:     abbe800563fc9c87b9072e14387cab15feb9ab8a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 00:45:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 00:46:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbe8005

kde-plasma/kwin: fix USE=systemd w/ libcxx

Already merged upstream in 
https://invent.kde.org/plasma/kwin/-/merge_requests/5811
but filed a backport MR which is pending at 
https://invent.kde.org/plasma/kwin/-/merge_requests/5892.

Closes: https://bugs.gentoo.org/933120
Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch | 27 ++++++++++++++++++++++++
 kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild          |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch 
b/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch
new file mode 100644
index 000000000000..8ba9615adaeb
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/933120
+https://invent.kde.org/plasma/kwin/-/merge_requests/5892
+
+From b9ec66615f08e2bad3928b8b207be904ab62e745 Mon Sep 17 00:00:00 2001
+From: Sam James <[email protected]>
+Date: Sun, 2 Jun 2024 00:25:26 +0100
+Subject: [PATCH] watchdog: add includes for geteuid
+
+05a3e2bad9a3baf27293f0b5ed4bef4f38952804 added `geteuid` use but didn't
+add the needed headers. This works by chance on libstdc++ systems via
+transitive includes, but it doesn't work on libc++ systems, as reported
+downstream in Gentoo at https://bugs.gentoo.org/933120.
+
+(cherry picked from commit 31a3961c4cd387aa4aa1a0c7bf197445a346e5f0)
+--- a/src/watchdog.cpp
++++ b/src/watchdog.cpp
+@@ -8,6 +8,8 @@
+ */
+ 
+ #include "watchdoglogging.h"
++#include <unistd.h>
++#include <sys/types.h>
+ #include <QCoreApplication>
+ #include <QTimer>
+ #include <systemd/sd-daemon.h>
+-- 
+GitLab

diff --git a/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild 
b/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
index 5e6849f9371d..cb02d4f27603 100644
--- a/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
@@ -118,6 +118,10 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.0.90.1-libcxx.patch
+)
+
 src_prepare() {
        ecm_src_prepare
 

Reply via email to