Prepare phase fails with: -------- * Applying plasma-desktop-6.0.80-override-include-dirs.patch ... patching file CMakeLists.txt patching file config-gentoo.cmake patching file kcms/mouse/CMakeLists.txt patching file kcms/touchpad/CMakeLists.txt Hunk #1 succeeded at 11 (offset -6 lines). can't find file to patch at input line 97 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake |index 88bf0c676..33be94c49 100644 |--- a/kcms/touchpad/backends/x11.cmake |+++ b/kcms/touchpad/backends/x11.cmake -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored -------- The file in question is not there. The Hunk in question is: -------- diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake index 88bf0c676..33be94c49 100644 --- a/kcms/touchpad/backends/x11.cmake +++ b/kcms/touchpad/backends/x11.cmake @@ -10,7 +10,7 @@ SET(backend_SRCS backends/x11/xrecordkeyboardmonitor.cpp ) -if (XORGLIBINPUT_FOUND) +if (HAVE_XORGLIBINPUT) SET(backend_SRCS ${backend_SRCS} -------- The relevant parts have been moved into the parent folders CMakeLists.txt, leading to the following patch instead: -------- --- a/kcms/touchpad/CMakeLists.txt 2024-06-05 17:05:34.455640191 +0200 +++ b/kcms/touchpad/CMakeLists.txt 2024-06-05 17:05:56.087640375 +0200 @@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\") if (BUILD_KCM_TOUCHPAD_X11) - if (NOT XORGLIBINPUT_FOUND) + if (NOT HAVE_XORGLIBINPUT) list(APPEND MISSING_DEPS "xorg-libinput") endif() if (NOT X11_XCB_FOUND) -------- With this Hunk the patching succeeds and plasma-desktop-9999 can be built.
Thanks. Patch not quite your version, please test.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=265cec56e535f6ec4a6f5f93f5d5eebb2dc24a8f commit 265cec56e535f6ec4a6f5f93f5d5eebb2dc24a8f Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2024-06-06 20:44:11 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2024-06-06 20:44:11 +0000 kde-plasma/plasma-desktop: Rebase override-include-dirs.patch Closes: https://bugs.gentoo.org/933616 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ...asma-desktop-6.1.80-override-include-dirs.patch | 103 +++++++++++++++++++++ .../plasma-desktop/plasma-desktop-9999.ebuild | 2 +- 2 files changed, 104 insertions(+), 1 deletion(-)
(In reply to Andreas Sturmlechner from comment #1) > Thanks. Patch not quite your version, please test. Works right ootb! Thank you very much!
