Upstream plasma-workspace commit 256b63173 adds optional systemd startup, a project that I gather has been ongoing for some time (the commit says two years). That commit touches (xembed-sni-proxy/)CMakeLists.txt, adding one line at the end: +ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) Gentoo/kde's xembed-sni-proxy-5.14.90-standalone.patch, meanwhile, applies two chunks to the same file (without the xembed-sni-proxy subdir as it's applied from inside it), with chunk #2 also at the end of the file, which has now changed so the chunk no longer applies. So gentoo's patch needs rebased on top of the upstream commit. >>> Preparing source in /tmp/portage/kde-plasma/xembed-sni-proxy-9999/work/xembed-sni-proxy-9999/xembed-sni-proxy ... * Applying xembed-sni-proxy-5.14.90-standalone.patch ... patching file CMakeLists.txt Hunk #2 FAILED at 95. 1 out of 2 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8512e4a1f5a9e2937343ed9710d0381d2a52ae4 commit e8512e4a1f5a9e2937343ed9710d0381d2a52ae4 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-09-24 20:45:47 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-09-24 20:49:18 +0000 kde-plasma/xembed-sni-proxy: Rebase standalone-patch on current HEAD Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/744181 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../xembed-sni-proxy-5.20.80-standalone.patch | 60 ++++++++++++++++++++++ .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-)
