As the title says, libkworkspace-5.18.80-standalone.patch needs rebased again. I guess it'll be libkworkspace-5.19.80-standalone.patch after the rebase. The upstream culprit commit appears to be: * commit 281f44c79 | Author: Nicolas Fella <nicolas.fella@gmx.de> | Date: Thu May 28 21:13:31 2020 +0200 | | Remove obsolete kwin_interface things | | This leads to a cmake error and I don't see it being used anywhere. | | libkworkspace/CMakeLists.txt | 5 ----- | libkworkspace/interface_util.h | 26 -------------------------- | 2 files changed, 31 deletions(-) Here's the failing patch-application bit from the emerge log: >>> 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 #3 FAILED at 96. Hunk #4 succeeded at 162 (offset -5 lines). 1 out of 4 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
Confirming.
Created attachment 643178 [details, diff] patch for the patch Here's a patch to be applied against the existing libkworkspace-5.18.80-standalone.patch. WFM. =:^) (@ other users: Don't try to apply against either the ebuild or upstream sources directly; dropping it in /etc/portage/patches won't work. Apply it against the existing patch in the files dir, re-manifest if your portage security settings require it, and the ebuild will then apply the patched patch as if it were the original. FWIW I have a custom local sync script that lets me drop the patch in /etc/portage/patches.ebuild much as I would drop a patch against upstream sources in /etc/portage/patches, but AFAIK there's no public solution for that, meaning users without their own local solution will need to apply it manually.)
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=526b182cc76c27ce787af835fbc8bfa3da07bc37 commit 526b182cc76c27ce787af835fbc8bfa3da07bc37 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2020-06-06 14:16:37 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-06-06 14:17:39 +0000 kde-plasma/libkworkspace: Rebase standalone.patch on top of HEAD Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/726078 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/libkworkspace-5.19.80-standalone.patch | 108 +++++++++++++++++++++ kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 2 +- 2 files changed, 109 insertions(+), 1 deletion(-)
