In case patch and bug cross, this is at gentoo/kde 1c6922a87 Unfortunately overlay a8ba387f9 as the fix for bug 836354 didn't last long; I didn't even get an okular update in! The new upstream culprit is ce8401e91, killing IconThemes under the general requires and adding it to desktop requires, just as they did in the previous instance with Crash. So same CMakeLists.txt patch-context line (line 55 of the current patch, should be around line 120 of CMakeLists.txt) that overlay commit a8ba387f9 added Crash to compared to the previous patch, now needs IconThemes as well. Here's the error: * Applying okular-22.07.70-optional-options.patch ... patching file CMakeLists.txt Hunk #2 FAILED at 108. 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 [ !! ]
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daadc0d9e5626aaa1ee3b52580e523b90b6c commit a626daadc0d9e5626aaa1ee3b52580e523b90b6c Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-03-30 05:47:38 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-03-30 05:47:38 +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/836389 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
You can also re-open the old bug in such cases where the same package with the same patch fails to apply after such a short time again.
(In reply to Andreas Sturmlechner from comment #2) > You can also re-open the old bug I considered that, but decided the patchfile in the title was different so different bug for it. But now that I think about it, I could have just as well edited the old bug's title when I reopened it. Unfortunately that didn't occur to me at the time, so new bug it was. Next time it happens, tho... Thanks.
Same song, different verse. okular-22.07.70-optional-options.patch again. This "verse" it's upstream commit 9eb404c33 killing it, moving ktextwidgets from general requires into desktop requires. (At least I got an okular update in between them this time! =:^)
I'm considering dropping this option.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ceb6aa4b1cf371109a0c8edea648763a6365d5f commit 6ceb6aa4b1cf371109a0c8edea648763a6365d5f Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-04-21 16:09:12 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-04-21 16:26:06 +0000 kde-apps/okular: Rebase optional-options patch on top of 22.04.0 Closes: https://bugs.gentoo.org/836389 Reported-by: Duncan <1i5t5.duncan@cox.net> Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ...0-optional-options.patch => okular-22.04.0-optional-options.patch} | 4 ++-- kde-apps/okular/okular-22.04.0.ebuild | 2 +- kde-apps/okular/okular-22.04.49.9999.ebuild | 2 +- kde-apps/okular/okular-9999.ebuild | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
