summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-09-18 19:40:21 +0000
committerAndreas Sturmlechner <asturm@gentoo.org>2024-09-19 10:43:16 +0200
commit924031f6594df891034810354731cd8190e538d3 (patch)
tree4a5c7eaac291f26aaf0362c9895291f272859f58
parentdev-java/swt: add 4.33 (diff)
downloadgentoo-924031f6594df891034810354731cd8190e538d3.tar.gz
gentoo-924031f6594df891034810354731cd8190e538d3.tar.bz2
gentoo-924031f6594df891034810354731cd8190e538d3.zip
kde-plasma/kdesu-gui: Fix build w/ kde-frameworks/kwindowsystem[-X]
Closes: https://bugs.gentoo.org/939735 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch28
-rw-r--r--kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild3
2 files changed, 30 insertions, 1 deletions
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch
new file mode 100644
index 000000000000..bb5317cb1cc5
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch
@@ -0,0 +1,28 @@
+From bcaa74b9c7d896f5578e1f681dfa1a1f0bf2756d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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
+
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild
index 99081e35a177..7c67dbaca947 100644
--- a/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild
@@ -35,7 +35,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.1.5-build-only-kdesu.patch" # downstream split
- "${FILESDIR}/${PN}-5.27.11-cmake.patch" # bug 939081, pending upstream MR
+ "${FILESDIR}/${PN}-5.27.11-cmake.patch" # bug 939081
+ "${FILESDIR}/${P}-fix-without-x11.patch" # bug 939735, pending upstream MR
)
src_prepare() {