Created attachment 618072 [details] patch-reject file Upstream keeps messing with this and screwing our standalone patches. This is what they did this time, around (upstream) line 21 (near line 72 after the first chunk of our patch is applied) of libkworkspace/CMakeLists.txt, , s/plasma-session/plasma-shutdown/: -qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) That's a context line in our patch, between two added sections, so that chunk fails due to unmatched context. Here's the patching error portage spits out: >>> Preparing source in /tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999/libkworkspace ... * Applying libkworkspace-5.18.80-standalone.patch ... patching file CMakeLists.txt Hunk #2 FAILED at 69. 1 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej [ !! ] * ERROR: kde-plasma/libkworkspace-9999::kde failed (prepare phase): * patch -p1 failed with /tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.18.80-standalone.patch *
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6 commit ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-03-12 23:31:49 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-03-12 23:33:19 +0000 kde-plasma/libkworkspace: Rebase ${PN}-5.18.80-standalone.patch on HEAD Necessary after upstream commit 3c34dfa97 Thanks-to: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/712226 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
