Upstream commit e294f6ab0: Use not deprecated SYSTEMD_USER_UNIT_INSTALL_DIR ... changed a bunch of CMakeLists.txt from that apparently deprecated var to KDE_INSTALL_SYSTEMDUSERUNITDIR. Included was (xembed-sni-proxy/)CMakeLists.txt, line 66ish, which is context for our existing xembed-sni-proxy-5.20.80-standalone.patch, which is now broken. The previous commit 033d005d6 merges fine. As some history, bug #744181 triggered the bump to the current 5.20.80 version of the patch back in Sept. 2020. It came up in the pre-file search. >>> Preparing source in /tmp/portage/kde-plasma/xembed-sni-proxy-9999/work/xembed-sni-proxy-9999/xembed-sni-proxy ... * Source directory (CMAKE_USE_DIR): "/tmp/portage/kde-plasma/xembed-sni-proxy-9999/work/xembed-sni-proxy-9999/xembed-sni-proxy" * Build directory (BUILD_DIR): "/tmp/portage/kde-plasma/xembed-sni-proxy-9999/work/xembed-sni-proxy-9999/xembed-sni-proxy_build" * Applying xembed-sni-proxy-5.20.80-standalone.patch ... patching file CMakeLists.txt Hunk #1 succeeded at 1 with fuzz 1. Hunk #2 FAILED at 97. 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=8078d9336f496fc5347956a8553f78bd3a22dce3 commit 8078d9336f496fc5347956a8553f78bd3a22dce3 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-01-18 15:49:00 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-01-18 15:49:00 +0000 kde-plasma/xembed-sni-proxy: Rebase standalone-patch on current HEAD Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/831396 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../xembed-sni-proxy-5.24.80-standalone.patch | 60 ++++++++++++++++++++++ .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 7 ++- 2 files changed, 63 insertions(+), 4 deletions(-)
