gentoo auto-resync : 19:09:2024 - 12:11:50

3 files changed, 32 insertions, 2 deletions

diff --git a/kde-plasma/kdesu-gui/Manifest b/kde-plasma/kdesu-gui/Manifest
index c0163cd4e447..5433c315d36f 100644
--- a/kde-plasma/kdesu-gui/Manifest
+++ b/kde-plasma/kdesu-gui/Manifest
@@ -1,10 +1,11 @@
 AUX kdesu-gui-5.27.11-build-only-kdesu.patch 2411 BLAKE2B 63c1d1b42e499470097daead457b694766a0a871001fec66fe966fc7391b567f982216df13b1973fac0e6153f4a56ac841cca860690ba43e9ed2ad502b969743 SHA512 9db751ec3b9dcffe26466c060729512b1cb287167c30727ed13c5338227c6943b2ae9ba7135c2f4e208442cd32b472d9b69c18df5411eb963b0268269eff0528
 AUX kdesu-gui-5.27.11-cmake.patch 639 BLAKE2B f7a8482400cff0d96f5d61f68d11d17dd9373d7225d00b43d65795da726e2b51f6f8fad80b3fc7d9f5f2014035303435671872f4e9c9506c7f11160678f741ad SHA512 ec7715892c7862daf74042e5c808604879c9747c393305afc54a3775adf64cb1b5769639ad36e8b8652ab788a9207690e0f35b0902ee8d59be25cdc7c33fffae
 AUX kdesu-gui-6.1.5-build-only-kdesu.patch 2043 BLAKE2B d938496e7276f468b72e3f8f8e1e1a623e57c0dbfff6882f53ef7f447f14ac835dfd858d2534d29424def3c1d04f12dd53e70f5b0c13f00bfa3a23c9d12fba91 SHA512 762e38da5e02f725418eadae0f90e8af42c8b53a3bb5814506b99c8b8f6517fa7cdebff574b900191462d9e989908f284256d5382a6ac534f4070bd1f681c1d4
+AUX kdesu-gui-6.1.5-fix-without-x11.patch 703 BLAKE2B a3a3b97a47a1a2721503f55ccb53781126b623fc918a9548dcb4f2419971057e3d75a464a5116948ceb64b530992b947baf34d0019c972931e80fa7489b0f56a SHA512 aa07203eba331a1714b60a149b3d4373ea5e77d8dd346aa033ac7ad704172df54f51618a9b39eec41c6c6210f116e22018a225626288cca162dcc9e90994783a
 DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006
 DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
 DIST kde-cli-tools-6.1.5.tar.xz 629280 BLAKE2B 200e316531ad6095fe0bfba356f2d5afb2f78dbc219e64bb14ed96d718b542475d3db9efdb8cad42a5c17dfaea7c33df3627a5747f17d549d5bbfe70d1a34e6c SHA512 48fcfdf832828a8c04b46c72dd35273e7859b719707529a755e475b1f82fdc65de641234db6c107ce1a1be05825b286fbf0d4d3620b4deb8e2163cb824dbf388
 EBUILD kdesu-gui-5.27.11-r1.ebuild 1153 BLAKE2B 1f72d6797a3f5c1d1927be255cbbdaa7a8ba0024a611d5e65928a23328c1615d0609e4a8e5581359db61b348324d35bc5263cce42770020123c7e4911bafb37e SHA512 c7cfca15c2ab943708591b565eb7557858916a9effa533f37565bfaa56d307a3e63fc2abe013039e4208dd74f7e5096ad256d6fe539d6ec45976ec5322d96fc0
 EBUILD kdesu-gui-6.1.4.ebuild 1248 BLAKE2B 475e1278d4cd4aa76751cc6d0371feef8ebec6c52852778a53e192406d70c9aaa1dde301d83a7b755163cc7f88edd260c96e4410817639c8e5bec3722e6de41d SHA512 409dfa4e1ec84e82faf27c48515e97665c147d5ae165f283b5ab3c5c7de28d53176ddb3fd67550df18c7be554b824ab5eabb91f065f1ae9d165bdc3121aba161
-EBUILD kdesu-gui-6.1.5.ebuild 1250 BLAKE2B edaaf6f1abc3377485bdd585edcbfb4dfb4e5b2de8288e8c1e8e0ea2ca814ce84e130ce312286e608f8dc43ccd84ed53929a25d0fd47db3329ae2f16b4e68591 SHA512 d40859fdaab6e5ec065f3bc6e0d1a395f85fe4af5fce655987dd26806f95611b792b2141000043c2ae52d8f3fd737c28a84d991ab6d834de1b25c002bc4db9a9
+EBUILD kdesu-gui-6.1.5.ebuild 1305 BLAKE2B 3fc9060e7ac56be80db48420aa02df63814502f5d7b211d26ae4582532cf3c663123ed7d84308e554fff86811de7325c091e8a94b0a0fbd47bba535a541393aa SHA512 fd947becc391aa24c1436ed9b3b400803debb7eaf2134ccfaaa08d900b4a013e7899752fd9b7cf181b371c6ca822e943124f9687c791e6185a4f6e62c3e3a008
 MISC metadata.xml 382 BLAKE2B 65e332d88052943d815597bae85a59fcc93ae16b2216202922007679f0dac8753cec074897dcd59c06ddccd2221977fb78e9b5fab34a6d752a2022fb93d42d65 SHA512 d767c9739c3a351a3d463c2e44cbb6b79b5673d9aeaecc429a3c177ab711aa510c2b83b97d5e3db3f6d8464444579cd07f73689c064cfb4cca1fc4e212fc3c6b
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() {