Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 827875 - [kde overlay] kde-apps/okular-9999 okular-21.11.80-tests.patch needs rebased
Summary: [kde overlay] kde-apps/okular-9999 okular-21.11.80-tests.patch needs rebased
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-11-30 07:24 UTC by Duncan
Modified: 2021-11-30 13:30 UTC (History)
0 users

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 Duncan 2021-11-30 07:24:40 UTC
I've not bisected but I'm currently at okular-upstream 8d078c419 (merged) and HEAD is 9144211ba so there's only three actual commits (plus the branch-merge of one of them).  The patch fails at generators/kimgio/CMakeLists.txt, which seems to have been touched by just one of the three: c962c6caf: kimgio generator: Make keciv2 dependency optional.

* Applying okular-21.11.80-tests.patch ...
patching file generators/chm/CMakeLists.txt
patching file generators/chm/autotests/CMakeLists.txt
patching file generators/chm/autotests/chmgeneratortest.cpp
patching file generators/comicbook/CMakeLists.txt
patching file generators/comicbook/autotests/CMakeLists.txt
patching file generators/kimgio/CMakeLists.txt
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file generators/kimgio/CMakeLists.txt.rej
patching file generators/kimgio/tests/CMakeLists.txt
patching file generators/kimgio/tests/kimgiotest.cpp                                                                                                           [ !! ]
* ERROR: kde-apps/okular-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-apps/okular-9999/files/okular-21.11.80-tests.patch
Comment 1 Larry the Git Cow gentoo-dev 2021-11-30 12:01:04 UTC
The bug has been closed via the following commit(s):

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

commit 9c8d408fdba995a29d3e9dc83b748acbffce7ba2
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-11-30 12:00:35 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-11-30 12:00:35 +0000

    kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch
    
    Closes: https://bugs.gentoo.org/827875
    Package-Manager: Portage-3.0.28, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +----------------------
 1 file changed, 1 insertion(+), 45 deletions(-)
Comment 2 Larry the Git Cow gentoo-dev 2021-11-30 13:30:02 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ff189ae3ccc7d26e95a942cb0a4eeba290e7d1

commit 15ff189ae3ccc7d26e95a942cb0a4eeba290e7d1
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-11-30 12:06:43 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-11-30 13:29:53 +0000

    kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch
    
    Bug: https://bugs.gentoo.org/827875
    Package-Manager: Portage-3.0.28, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +----------------------
 1 file changed, 1 insertion(+), 45 deletions(-)