Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 732312 - [kde overlay] kde-apps/okular-9999 okular-20.03.70-tests.patch failing as of 19d98d6a7
Summary: [kde overlay] kde-apps/okular-9999 okular-20.03.70-tests.patch failing as of ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-07-12 04:09 UTC by Duncan
Modified: 2020-07-12 22:55 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 Duncan 2020-07-12 04:09:53 UTC
Upstream 19d98d6a7 is a clang-format patch touching many files, apparently including two that gentoo's okular-20.03.70-tests.patch tries to touch as well, without success after that upstream patch/commit, so ours needs rebased against current upstream.

>>> Preparing source in /tmp/portage/kde-apps/okular-9999/work/okular-9999 ...
* Applying okular-18.12.0-tests.patch ...                                                                                                        [ ok ]
* Applying okular-20.03.70-tests.patch ...
patching file generators/chm/CMakeLists.txt
patching file generators/chm/autotests/CMakeLists.txt
patching file generators/chm/autotests/chmgeneratortest.cpp
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- saving rejects to file generators/chm/autotests/chmgeneratortest.cpp.rej
patching file generators/comicbook/CMakeLists.txt
patching file generators/comicbook/autotests/CMakeLists.txt
patching file generators/kimgio/CMakeLists.txt
patching file generators/kimgio/tests/CMakeLists.txt
patching file generators/kimgio/tests/kimgiotest.cpp
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file generators/kimgio/tests/kimgiotest.cpp.rej                                                       [ !! ]
* ERROR: kde-apps/okular-9999::kde failed (prepare phase):
Comment 1 Larry the Git Cow gentoo-dev 2020-07-12 22:55:52 UTC
The bug has been closed via the following commit(s):

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

commit 5e62be6e74c9db769d52d56ed47122db65b202a3
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-07-11 21:45:45 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-07-12 22:51:51 +0000

    kde-apps/okular: Drop broken tests-optional patch
    
    Now we rely on patched ECMAddTests.cmake to skip them.
    
    Closes: https://bugs.gentoo.org/732312
    Package-Manager: Portage-2.3.103, Repoman-2.3.23
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 kde-apps/okular/files/okular-18.12.0-tests.patch  |  17 ---
 kde-apps/okular/files/okular-20.03.70-tests.patch | 148 ----------------------
 kde-apps/okular/okular-20.08.49.9999.ebuild       |   5 -
 kde-apps/okular/okular-9999.ebuild                |   5 -
 4 files changed, 175 deletions(-)