Bug 833532 – [kde overlay] kde-plasma/plasma-workspace-9999 plasma-workspace-5.21.5-split-libkworkspace.patch fails to apply

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description jospezial 2022-02-17 15:56:23 UTC]

The patch needs to be rebased because of
https://invent.kde.org/plasma/plasma-workspace/-/commit/d7871c739d83eee5714c70ee071ab14db8aa47e5

 * Package:    kde-plasma/plasma-workspace-9999
 * Repository: kde
 * Maintainer: [e-mail]
 * Upstream:   https://bugs.kde.org/
 * USE:        abi_x86_64 amd64 calendar elibc_glibc fontconfig kernel_linux policykit semantic-desktop userland_GNU
 * FEATURES:   ccache network-sandbox preserve-libs sandbox userpriv usersandbox
>>> Unpacking source...
 * Repository id: plasma_plasma-workspace.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_PLASMA_PLASMA_WORKSPACE
 *   EGIT_OVERRIDE_BRANCH_PLASMA_PLASMA_WORKSPACE
 *   EGIT_OVERRIDE_COMMIT_PLASMA_PLASMA_WORKSPACE
 *   EGIT_OVERRIDE_COMMIT_DATE_PLASMA_PLASMA_WORKSPACE
 * 
 * Fetching https://invent.kde.org/plasma/plasma-workspace.git ...
git fetch https://invent.kde.org/plasma/plasma-workspace.git +HEAD:refs/git-r3/HEAD
git symbolic-ref refs/git-r3/kde-plasma/plasma-workspace/5/__main__ refs/git-r3/HEAD
 * Checking out https://invent.kde.org/plasma/plasma-workspace.git to /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT update -->
   repository:               https://invent.kde.org/plasma/plasma-workspace.git
   updating from commit:     2141988c3be9c5ea6d82530baa1d81c6a9dd110c
   to commit:                dde0f20b2357a6dd6500e5331c04f14f904f5cc7
 CMakeLists.txt                                                                  |  9 ++++++---

...

 176 files changed, 532 insertions(+), 157 deletions(-)
>>> Source unpacked in /var/tmp/portage/kde-plasma/plasma-workspace-9999/work
>>> Preparing source in /var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999 ...
 * Source directory (CMAKE_USE_DIR): "/var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999"
 * Build directory  (BUILD_DIR):     "/var/tmp/portage/kde-plasma/plasma-workspace-9999/work/plasma-workspace-9999_build"
 * Applying plasma-workspace-5.21.5-split-libkworkspace.patch ...
patching file CMakeLists.txt
Hunk #1 succeeded at 78 with fuzz 2 (offset 5 lines).
Hunk #2 FAILED at 215.
1 out of 2 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
 [ !! ]
 * ERROR: kde-plasma/plasma-workspace-9999::kde failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/kde-plasma/plasma-workspace-9999/files/plasma-workspace-5.21.5-split-libkworkspace.patch
 * 
 * Call stack:
 *               ebuild.sh, line  127:  Called src_prepare
 *             environment, line 3332:  Called ecm_src_prepare
 *             environment, line 1964:  Called cmake_src_prepare
 *             environment, line 1624:  Called default_src_prepare
 *      phase-functions.sh, line  934:  Called __eapi8_src_prepare
 *             environment, line  673:  Called eapply '--' '/var/tmp/portage/kde-plasma/plasma-workspace-9999/files/plasma-workspace-5.21.5-split-libkworkspace.patch' '/var/tmp/portage/kde-plasma/plasma-workspace-9999/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch'
 *             environment, line 1784:  Called _eapply_patch '/var/tmp/portage/kde-plasma/plasma-workspace-9999/files/plasma-workspace-5.21.5-split-libkworkspace.patch'
 *             environment, line 1722:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/kde-plasma/plasma-workspace-9999/files/plasma-workspace-5.21.5-split-libkworkspace.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 *

[Comment 1 Duncan 2022-02-21 07:30:47 UTC]

Seeing this with this weeks updates here too.  Just beginning analysis but I see this bug is already filed.

FWIW last week's update was to (upstream) 54ac8316a, which unsurprisingly still patches and rebuilds fine.  Current head is 524b13ad5, of course bad.  Looks like about 30 candidate commits between but I haven't yet looked further.

[Comment 2 Duncan 2022-02-21 07:43:31 UTC]

(Upstream) d7871c739 is the culprit commit triggering the needed patch rebase.

[Comment 3 Duncan 2022-02-21 08:00:08 UTC]

Gentoo patch chunk 2 pre-context:

add_subdirectory(doc)

Partial upstream patch (commit d7871c739) of that line:

-add_subdirectory(doc)
+if(KF5DocTools_FOUND)
+  add_subdirectory(doc)
+endif()

So upstream patch killed that context line.  Should be easy enough to manually change the gentoo patch pending the rebase.

[Comment 4 Duncan 2022-02-21 08:27:53 UTC]

Created attachment 765548 [details, diff]
Imperfect but working *replacement* patch

This is a minimal manual fix that ignores the existing first-chunk fuzz and second-chunk offset, but it applies and the package builds and merges.

(Note that this is intended to replace the existing gentoo patch and isn't a patch of it, so replace it don't try to patch it.)

[Comment 5 Larry the Git Cow 2022-02-21 11:47:19 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=b916ce3bacc42ce97341912e678d919f45ffe9d4

commit b916ce3bacc42ce97341912e678d919f45ffe9d4
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2022-02-21 11:33:39 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2022-02-21 11:47:06 +0000

    kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch
    
    Closes: https://bugs.gentoo.org/833532
    Package-Manager: Portage-3.0.30, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 ...sma-workspace-5.24.80-split-libkworkspace.patch | 37 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)