since upstream commit commit 6bab1f518c503ced8c8aab84bb2f354eedca5c32 Author: Stefan Brüns <stefan.bruens@rwth-aachen.de> Date: Sat Jul 6 02:10:40 2019 +0200 Split ksmserver into a small application that handles startup and ksmserver This allows new startup procedures to use a session manager and also allows us to slowly replace the session manager without breaking plasma. Following on from the previous refactor, Startup and Shutdown are moved from kmserver and the previous calls into KSMserver are replaced with DBus calls. Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D21995 build of kde-plasma/plasma-workspace fails with this error: FAILED: startkde/plasma-session/CMakeFiles/plasma_session.dir/shutdown.cpp.o /usr/lib/distcc/bin/x86_64-pc-linux-gnu-g++ -DKCOREADDONS_LIB -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_URL_CAST_FROM_STRING -DQT_WIDGETS_LIB -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -Istartkde/plasma-session -I/var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session -Istartkde/plasma-session/plasma_session_autogen/include -I. -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtCore -isystem /usr/lib64/qt5/mkspecs/linux-g++ -isystem /usr/include/qt5/QtDBus -isystem /usr/include/KF5/KConfigCore -isystem /usr/include/KF5 -isystem /usr/include/KF5/KService -isystem /usr/include/KF5/KCoreAddons -isystem /usr/include/KF5/KNotifications -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtGui -isystem /usr/include/KF5/KIOCore -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtConcurrent -isystem /usr/include/kworkspace5 -isystem /usr/include/phonon4qt5 -DQT_NO_DEBUG -DNDEBUG -O2 -march=bdver4 -ggdb -msahf -mpopcnt -mlzcnt --param l1-cache-size=32 --param l1-cache-line-size=64 --param l2-cache-size=1024 -mtune=bdver4 -ftree-vectorize -fvect-cost-model -pipe -std=c++0x -fno-operator-names -fno-exceptions -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -Wvla -Wdate-time -Wsuggest-override -Wlogical-op -fdiagnostics-color=always -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -std=gnu++11 -MD -MT startkde/plasma-session/CMakeFiles/plasma_session.dir/shutdown.cpp.o -MF startkde/plasma-session/CMakeFiles/plasma_session.dir/shutdown.cpp.o.d -o startkde/plasma-session/CMakeFiles/plasma_session.dir/shutdown.cpp.o -c /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp:10:10: fatal error: sessionmanagementbackend.h: No such file or directory 10 | #include "sessionmanagementbackend.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. distcc[190] ERROR: compile /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp on 192.168.10.101/2 failed distcc[190] (dcc_build_somewhere) Warning: remote compilation of '/var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp' failed, retrying locally distcc[190] Warning: failed to distribute /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp to 192.168.10.101/2, running locally instead /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999/startkde/plasma-session/shutdown.cpp:10:10: fatal error: sessionmanagementbackend.h: No such file or directory 10 | #include "sessionmanagementbackend.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Not sure if this is an upstream bug or a result of splitting plasma-workspace into kde-plasma/libkworkspace and kde-plasma/plasma-workspace.
(In reply to Johannes Hirte from comment #0) > or a result of splitting plasma-workspace into kde-plasma/libkworkspace > and kde-plasma/plasma-workspace. Indeed it is a result of that, there's been a lot of upstream churn in that area lately.
Created attachment 584160 [details, diff] updated libkworkspace standalone patch The fix seems to be to make libkworkspace install that missing header. Attached is updated patch for libkworkspace that also installs sessionmanagementbackend.h With that plasma-workspace compiles cleanly.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=9757d81546d349739813297ce7f66225c964c6aa commit 9757d81546d349739813297ce7f66225c964c6aa Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2019-07-24 11:41:11 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2019-07-24 11:43:45 +0000 kde-plasma/libkworkspace: Fix libkworspace standalone.patch Thanks-to: Urmet Saar <urmet.saar@gmail.com> Closes: https://bugs.gentoo.org/690098 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/libkworkspace-5.16.80-standalone.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
(In reply to Larry the Git Cow from comment #3) > The bug has been closed via the following commit(s): > > https://gitweb.gentoo.org/proj/kde.git/commit/ > ?id=9757d81546d349739813297ce7f66225c964c6aa > > commit 9757d81546d349739813297ce7f66225c964c6aa > Author: Andreas Sturmlechner <asturm@gentoo.org> > AuthorDate: 2019-07-24 11:41:11 +0000 > Commit: Andreas Sturmlechner <asturm@gentoo.org> > CommitDate: 2019-07-24 11:43:45 +0000 > > kde-plasma/libkworkspace: Fix libkworspace standalone.patch > > Thanks-to: Urmet Saar <urmet.saar@gmail.com> > Closes: https://bugs.gentoo.org/690098 > Package-Manager: Portage-2.3.69, Repoman-2.3.16 > Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> > > .../files/libkworkspace-5.16.80-standalone.patch | 13 > +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) >> 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 "$@" *
