diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-09-18 19:40:21 +0000 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-11-05 23:20:33 +0100 |
| commit | 1867111a3196e2e2a3c10bdf48979df547e6affb (patch) | |
| tree | f03260663ae03387b03ba336c869f63345dc49f9 /kde-plasma/kdesu-gui | |
| parent | ac5c20499ce81af28356f8a5ba38b9531150aabc (diff) | |
| download | kde-1867111a3196e2e2a3c10bdf48979df547e6affb.tar.gz kde-1867111a3196e2e2a3c10bdf48979df547e6affb.tar.bz2 kde-1867111a3196e2e2a3c10bdf48979df547e6affb.zip | |
kde-plasma/kdesu-gui: Fix build w/ kde-frameworks/kwindowsystem[-X]
Bug: https://bugs.gentoo.org/939735
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/kdesu-gui')
| -rw-r--r-- | kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-fix-without-x11.patch | 28 | ||||
| -rw-r--r-- | kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild | 5 | ||||
| -rw-r--r-- | kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild | 1 |
3 files changed, 33 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 00000000000..bb5317cb1cc --- /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.2.49.9999.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild index 90691276d77..92a6c0584b4 100644 --- a/kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild +++ b/kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild @@ -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 diff --git a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild index 7210b22aef7..70dfd9e8d4c 100644 --- a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild +++ b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild @@ -33,6 +33,7 @@ RDEPEND="${DEPEND} sys-apps/dbus[X] " +# downstream split PATCHES=( "${FILESDIR}/${PN}-6.1.80-build-only-kdesu.patch" ) src_prepare() { |