Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 830333

Summary: [kde overlay] kde-frameworks/kdoctools-9999 kdoctools-5.66.0-docbundledir.patch needs rebased
Product: Gentoo Linux Reporter: Duncan <1i5t5.duncan>
Component: OverlaysAssignee: Gentoo KDE team <kde>
Status: RESOLVED FIXED    
Severity: normal CC: jstein
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---

Description Duncan 2021-12-31 05:20:23 UTC 
* Applying kdoctools-5.66.0-docbundledir.patch ...
patching file autotests/CMakeLists.txt
patching file autotests/documentcustomdirtest.cpp
patching file autotests/documentdirstest.cpp
patching file config-kdoctools.h.cmake
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file config-kdoctools.h.cmake.rej
patching file src/xslt.cpp
Hunk #1 succeeded at 485 (offset -4 lines). [snip spaces] [ !! ]
* ERROR: kde-frameworks/kdoctools-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-frameworks/kdoctools-9999/files/kdoctools-5.66.0-docbundledir.patch

This is due to upstream 6607c892c which touches config-kdoctools.h.cmake, removing the "5" from "KF5" in two places on line 5, destroying the context of our patch.
Comment 1 Larry the Git Cow gentoo-dev 2022-01-02 08:13:01 UTC 
The bug has been closed via the following commit(s):

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

commit 4176f19d14ff21be2d078490517f2fcfccceb15f
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2022-01-02 07:53:48 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2022-01-02 07:53:48 +0000

    kde-frameworks/kdoctools: Fall back to downstream docbundledir patch
    
    Upstream commit 6607c892c5be91fc8dbe11f52b229c525afb72f0
    
    Closes: https://bugs.gentoo.org/830333
    Package-Manager: Portage-3.0.30, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../kdoctools-5.54.0-gentoo-docbundledir.patch     | 30 ++++++++++++++++++++++
 kde-frameworks/kdoctools/kdoctools-9999.ebuild     |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)