Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 710504 - [kde overlay] kde-apps/okular-9999: okular-18.08.0-tests.patch fails to apply due to upstream 5ecbb51f7
Summary: [kde overlay] kde-apps/okular-9999: okular-18.08.0-tests.patch fails to apply...
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: 2020-02-22 16:45 UTC by Duncan
Modified: 2020-02-22 20:06 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-02-22 16:45:44 UTC
Upstream's update to switch literal 0 to nullptr collides with gentoo/kde's patch, which still looks for that 0.

* Applying okular-18.08.0-tests.patch ...
[snip applying hunks]
patching file generators/chm/autotests/chmgeneratortest.cpp
Hunk #1 FAILED at 34.

Upstream's change (now actually ~line 88):
-    Okular::Document *m_document = new Okular::Document( 0 );
+    Okular::Document *m_document = new Okular::Document( nullptr );

That's a context line in gentoo/kde's patch, which no longer applies as a result.  After manually editing the patch from 0 to nullptr it applies successfully and okular builds (and runs in a quick launch test) again.
Comment 1 Larry the Git Cow gentoo-dev 2020-02-22 19:43:03 UTC
The bug has been closed via the following commit(s):

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

commit fdc82bc0a9bbfdea673c0f05b3aa2f49971e0b32
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-02-22 19:42:28 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-02-22 19:42:28 +0000

    kde-apps/okular: Rebase okular-18.08.0-tests.patch on top of HEAD
    
    Closes: https://bugs.gentoo.org/710504
    Package-Manager: Portage-2.3.89, Repoman-2.3.20
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/{okular-18.08.0-tests.patch => okular-20.03.70-tests.patch}   | 2 +-
 kde-apps/okular/okular-9999.ebuild                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Comment 2 Andreas Sturmlechner gentoo-dev 2020-02-22 19:49:41 UTC
Thanks for reporting!