Created attachment 610022 [details] reject file Somewhere between upstream e7dd6caea105f8414ff3c6329e08b0f857c296b9 (last working build) and f4ff33f06149ca79accf6da361b682b31022a80c (current HEAD), gentoo's standalone patch started failing. I can bisect later and will update summary with culprit commit if it's not fixed before then. >>> Preparing source in /tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999/libkworkspace ... * Applying libkworkspace-5.16.80-standalone.patch ... patching file CMakeLists.txt Hunk #2 FAILED at 67. Hunk #3 succeeded at 87 (offset 3 lines). Hunk #4 succeeded at 154 (offset 4 lines). 1 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej CMakeLists.txt.rej (attached too): --- CMakeLists.txt +++ CMakeLists.txt @@ -67,8 +120,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) . qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) +else() qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) +set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +endif() . set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
No need to bisect, the only recent commit in libkworkspace subdir is 6253163a and that will break the patch almost certainly.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=6be3f31e14f6df74b7c843d1d5535d3971620feb commit 6be3f31e14f6df74b7c843d1d5535d3971620feb Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-02-02 17:38:56 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-02-02 18:04:56 +0000 kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/707670 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 112 +++++++++++++++++++++ kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-)
Thanks for reporting, patch rebased cleanly, but I don't run master. Please check back in case of trouble.
Created attachment 611174 [details] full build log (In reply to Andreas Sturmlechner from comment #3) > Thanks for reporting, patch rebased cleanly, but I don't run master. Please > check back in case of trouble. Confirming the patch applies, but... >>> Compiling source in /tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999/libkworkspace ... * Working in BUILD_DIR: "/tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999_build" ninja -v -j7 -l8 ninja: error: '/kf5_org.kde.KLauncher.xml', needed by 'klauncher_interface.cpp', missing and no known rule to make it * ERROR: kde-plasma/libkworkspace-9999::kde failed (compile phase): Presumably that's because the qt5_add_dbus_interface...KLauncher.xml file dependency added in the new standalone patch isn't completely defined when stand-alone.
(In reply to Duncan from comment #4) > Presumably that's because the qt5_add_dbus_interface...KLauncher.xml file > dependency added in the new standalone patch isn't completely defined when > stand-alone. I mean... line added by upstream, that's a new context line in the new patch. I see the file there, from kde-frameworks/kinit-9999 as /usr/share/dbus-1/interfaces/kf5_org.kde.KLauncher.xml, so cmake/ninja must just need a bit more information about how to find it, that it's not getting in stand-alone mode.
Created attachment 612086 [details, diff] libkworkspace-5.18.80-standalone.patch Hi, I tried to figure out what's needed to get it working again. The '/kf5_org.kde.KLauncher.xml' error is quite simple to fix - find_package(KF5... needs to include 'Init' component. But with that easy error out of the way 6253163a bites. /var/tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999/libkworkspace/updatelaunchenvjob.cpp:23:10: fatal error: startup_interface.h: No such file or directory Turned out that was also a one-line fix. Attached patch at least compiles fine for me.
Created attachment 612394 [details] CMakelists.txt.rej (Against Attachment 612086 [details, diff] Version) Attachment 612086 [details, diff]'s new version of the patch fails to apply for me: --- Hunk #1 FAILED at 1. Hunk #2 FAILED at 16. Hunk #3 FAILED at 34. Hunk #4 succeeded at 167 with fuzz 2 (offset 62 lines). 3 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej --- CMakelists.txt.rej attached.
Created attachment 612396 [details, diff] patch for /etc/portage/patches (applies on top of the existing patch) (In reply to Megas of Vecanti from comment #7) > Attachment 612086 [details, diff] [details, diff]'s new version of the patch fails to apply > for me: It works here (or rather, what it does works...). I'm guessing you applied it wrong. Note that the patch as above should /replace/ the existing patch of the same name. You probably tried to simply add it to /etc/portage/patches, which would cause portage to attempt to apply it /over-top-of/ the existing patch, instead of replacing it, and that's not going to work because most of it, all but the parts changed from the existing patch, has already been applied by the existing patch. Here's the patch I put in /etc/portage/patches that seems to work for me. While it works, being manually hacked from effectively a diff of diffs (aka a diff of patches), the @@ sections are wonky. Luckily that's just fluff for humans that's ignored by patch, so it doesn't affect how it actually applies.
Yes, in fact, that's exactly what I did. I didn't know that this was a patch to a patch that was already in the ebuild. XD Sorry! And yes, this new patch fixes the build. Excellent job. Thanks!
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf1fce5d328c12dba297b2f4be5274ebb1ac4475 commit bf1fce5d328c12dba297b2f4be5274ebb1ac4475 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-02-08 19:59:26 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-02-08 20:01:51 +0000 kde-plasma/libkworkspace: Properly rebase on top of HEAD, fix DEPENDs Upstream commit 6253163af827e049d53b912494e04c1ea36d4e57 Thanks-to: Urmet Saar <urmet.saar@gmail.com> Closes: https://bugs.gentoo.org/707670 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 17 +++++++++-------- kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 1 + 2 files changed, 10 insertions(+), 8 deletions(-)
(In reply to Larry the Git Cow from comment #10) > The bug has been closed via the following commit(s): > > https://gitweb.gentoo.org/proj/kde.git/commit/ > ?id=bf1fce5d328c12dba297b2f4be5274ebb1ac4475 > > commit bf1fce5d328c12dba297b2f4be5274ebb1ac4475 > Author: Andreas Sturmlechner <asturm@gentoo.org> > AuthorDate: 2020-02-08 19:59:26 +0000 > Commit: Andreas Sturmlechner <asturm@gentoo.org> > CommitDate: 2020-02-08 20:01:51 +0000 > > kde-plasma/libkworkspace: Properly rebase on top of HEAD, fix DEPENDs > > Upstream commit 6253163af827e049d53b912494e04c1ea36d4e57 > Thanks-to: Urmet Saar <urmet.saar@gmail.com> > Closes: https://bugs.gentoo.org/707670 > Package-Manager: Portage-2.3.87, Repoman-2.3.20 > Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> > > .../files/libkworkspace-5.18.80-standalone.patch | 17 > +++++++++-------- > kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 1 + > 2 files changed, 10 insertions(+), 8 deletions(-) Sorry for the doublepost but this bug is newer than https://bugs.gentoo.org/show_bug.cgi?id=690098 >> Source unpacked in /var/tmp/portage/kde-plasma/libkworkspace-9999/work >>> Preparing source in /var/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 /var/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.18.80-standalone.patch * * Call stack: * ebuild.sh, line 125: Called src_prepare * environment, line 2997: Called ecm_src_prepare * environment, line 1575: Called cmake_src_prepare * environment, line 1271: Called default_src_prepare * phase-functions.sh, line 920: Called __eapi6_src_prepare * environment, line 304: Called eapply '/var/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.18.80-standalone.patch' * environment, line 1422: Called _eapply_patch '/var/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.18.80-standalone.patch' * environment, line 1360: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.18.80-standalone.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" *
