Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 878397 - [kde overlay] app-office/kmymoney-9999: kmymoney-9999-cmake.patch fails to apply
Summary: [kde overlay] app-office/kmymoney-9999: kmymoney-9999-cmake.patch fails to apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-10-26 19:03 UTC by Jack
Modified: 2023-09-08 23:17 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jack 2022-10-26 19:03:42 UTC
CMAkeLists.txt has changed with some lines changed from QT_MIN_VERSION to QT_MAX_VERSION, so the patch needs to be regenerated.

Reproducible: Always

Steps to Reproduce:
emerge =kmymoney-9999
Actual Results:  
fails in prepare stage

 * Applying kmymoney-9999-cmake.patch ...
patching file CMakeLists.txt
Hunk #1 FAILED at 111.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
 [ !! ]


Expected Results:  
Successful build

Probably due to commits 76b5dc3cbb54df52f7b2f7dcf843946717875550 and/or 7862cdd9224897682a55013412edbb846e14a7bc applied 15 and 16 October.
Comment 1 Andreas Sturmlechner gentoo-dev 2022-12-10 10:14:44 UTC
Sorry for not looking into this for quite some time. Some recent changes made in upstream code without proper explanation made me reluctant to visit their repo.
Comment 2 Jack 2022-12-20 00:07:23 UTC
I don't fully follow Issue 63 you opened there, but I do see that CMakeLists.txt seems to have greatly diverged between 5.1 and master, so maybe it's safe to take another look?
Comment 3 Jack 2023-02-11 18:59:12 UTC
ping?
Comment 4 Andreas Sturmlechner gentoo-dev 2023-03-26 12:55:06 UTC
(In reply to Jack from comment #2)
> I don't fully follow Issue 63 you opened there
Upstream don't seem to follow either.
Comment 5 Larry the Git Cow gentoo-dev 2023-03-26 13:09:22 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da1c2adbbef9c70f9a25603dd853fde43677cb1

commit 9da1c2adbbef9c70f9a25603dd853fde43677cb1
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-03-26 12:55:38 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-03-26 12:55:38 +0000

    app-office/libalkimia: Another cmake fix, this time from upstream
    
    Bug: https://bugs.gentoo.org/878397
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/libalkimia-8.1.0-cmake-webengine.patch   | 27 ++++++++++++++++++++++
 ...mia-8.1.1.ebuild => libalkimia-8.1.1-r1.ebuild} |  7 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
Comment 6 Andreas Sturmlechner gentoo-dev 2023-03-26 13:11:15 UTC
Fixing upstream.
Comment 7 Larry the Git Cow gentoo-dev 2023-03-26 13:11:59 UTC
The bug has been closed via the following commit(s):

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

commit 2476f7e731bf088e74f041c472277fd257fee09e
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-03-26 12:40:49 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-03-26 13:07:26 +0000

    app-office/kmymoney: Rebase cmake.patch on top of HEAD
    
    Closes: https://bugs.gentoo.org/878397
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../kmymoney/files/kmymoney-9999-cmake.patch       | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)
Comment 8 Larry the Git Cow gentoo-dev 2023-03-26 18:02:46 UTC
The bug has been referenced in the following commit(s):

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

commit d1ddcb664613d4398d87ac10962f98f277352f68
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-03-26 18:01:37 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-03-26 18:02:29 +0000

    app-office/kmymoney: Patch upstreamed
    
    Upstream commit b6c2c157f403c9ab74067cc2611ffebd3f87d8d7
    
    Bug: https://bugs.gentoo.org/878397
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../kmymoney/files/kmymoney-9999-cmake.patch       | 35 ----------------------
 app-office/kmymoney/kmymoney-9999.ebuild           |  2 --
 2 files changed, 37 deletions(-)