Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 836354 - [kde overlay] kde-apps/okular-9999 okular-22.03.70-optional-options.patch needs rebased
Summary: [kde overlay] kde-apps/okular-9999 okular-22.03.70-optional-options.patch nee...
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: 2022-03-29 07:23 UTC by Duncan
Modified: 2022-03-29 10:51 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 2022-03-29 07:23:51 UTC
In case patch and bug cross, this is at gentoo/kde b9b63c044.

Upstream d8f0baa2b moves the kcrash component (Crash) from general REQUIRED to the if (BUILD_DESKTOP) section in CMakeLists.txt.  Here's the latter change (should be about line 120):

-    find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts)
+    find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash)

That also happens to be part of the context in our okular-22.03.70-optional-options.patch, but it's context in the middle of a hunk between two changes so patch won't fuzz it out, and our patch needs rebased.


* Applying okular-22.03.70-optional-options.patch ...
patching file CMakeLists.txt
Hunk #1 succeeded at 91 (offset 7 lines).
Hunk #2 FAILED at 102.
1 out of 2 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patching file config-okular.h.cmake
patching file core/generator.cpp
patching file core/scripter.cpp                                                                                                                                [ !! ]
* ERROR: kde-apps/okular-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-apps/okular-9999/files/okular-22.03.70-optional-options.patch
Comment 1 Larry the Git Cow gentoo-dev 2022-03-29 10:51:13 UTC
The bug has been closed via the following commit(s):

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

commit a8ba387f91de80429faf70dbf3c29b908503e45f
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2022-03-29 10:37:07 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2022-03-29 10:38:32 +0000

    kde-apps/okular: Rebase optional-options patch on top of 22.07.70
    
    Reported-by: Duncan <1i5t5.duncan@cox.net>
    Closes: https://bugs.gentoo.org/836354
    Package-Manager: Portage-3.0.30, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/okular-22.07.70-optional-options.patch   | 113 +++++++++++++++++++++
 kde-apps/okular/okular-9999.ebuild                 |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)