Skip to content

Commit

Permalink
kde-plasma/kdesu-gui: Fix build w/ kde-frameworks/kwindowsystem[-X]
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/939735
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Nov 5, 2024
1 parent ac5c204 commit 1867111
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
28 changes: 28 additions & 0 deletions kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From bcaa74b9c7d896f5578e1f681dfa1a1f0bf2756d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
Date: Wed, 18 Sep 2024 19:34:20 +0000
Subject: [PATCH] Fix build w/ WITH_X11=OFF when KWindowSystem was built w/
KWINDOWSYSTEM_X11=OFF

Signed-off-by: Andreas Sturmlechner <[email protected]>
---
kdesu/kdesu.cpp | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
index 887df083..a5e4a945 100644
--- a/kdesu/kdesu.cpp
+++ b/kdesu/kdesu.cpp
@@ -40,7 +40,9 @@
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <kshell.h>
+#if WITH_X11
#include <kstartupinfo.h>
+#endif
#include <kuser.h>
#include <kwindowsystem.h>

--
2.46.0

5 changes: 4 additions & 1 deletion kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ RDEPEND="${DEPEND}
sys-apps/dbus[X]
"

PATCHES=( "${FILESDIR}/${PN}-6.1.80-build-only-kdesu.patch" )
PATCHES=(
"${FILESDIR}/${PN}-6.1.80-build-only-kdesu.patch" # downstream split
"${FILESDIR}/${PN}-6.1.5-fix-without-x11.patch" # bug 939735, git master
)

src_prepare() {
ecm_src_prepare
Expand Down
1 change: 1 addition & 0 deletions kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ RDEPEND="${DEPEND}
sys-apps/dbus[X]
"

# downstream split
PATCHES=( "${FILESDIR}/${PN}-6.1.80-build-only-kdesu.patch" )

src_prepare() {
Expand Down

0 comments on commit 1867111

Please sign in to comment.