[gentoo-commits] proj/kde:master commit in: kde-plasma/kdesu-gui/, kde-plasma/kdesu-gui/files/

[gentoo-commits] proj/kde:master commit in: kde-plasma/kdesu-gui/, kde-plasma/kdesu-gui/files/

[Andreas Sturmlechner]

commit:     4954f9a10111d6c4516253c8e607bf407e0c2b6e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 16:47:26 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 16:47:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4954f9a1

kde-plasma/kdesu-gui: Un-collide w/ 6.1.5 build-only-kdesu.patch

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

 ...5-build-only-kdesu.patch => kdesu-gui-6.1.80-build-only-kdesu.patch} | 0
 kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.80-build-only-kdesu.patch
similarity index 100%
rename from kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch
rename to kde-plasma/kdesu-gui/files/kdesu-gui-6.1.80-build-only-kdesu.patch

diff --git a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
index 598005b3d7..7210b22aef 100644
--- a/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
+++ b/kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}
 	sys-apps/dbus[X]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-6.1.5-build-only-kdesu.patch" )
+PATCHES=( "${FILESDIR}/${PN}-6.1.80-build-only-kdesu.patch" )
 
 src_prepare() {
 	ecm_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-plasma/kdesu-gui/, kde-plasma/kdesu-gui/files/

[Andreas Sturmlechner]

commit:     1867111a3196e2e2a3c10bdf48979df547e6affb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 19:40:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 22:20:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1867111a

kde-plasma/kdesu-gui: Fix build w/ kde-frameworks/kwindowsystem[-X]

Bug: https://bugs.gentoo.org/939735
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kdesu-gui-6.1.5-fix-without-x11.patch    | 28 ++++++++++++++++++++++
 kde-plasma/kdesu-gui/kdesu-gui-6.2.49.9999.ebuild  |  5 +++-
 kde-plasma/kdesu-gui/kdesu-gui-9999.ebuild         |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

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 0000000000..bb5317cb1c
--- /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 90691276d7..92a6c0584b 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 7210b22aef..70dfd9e8d4 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() {