prepare-phase error: * Applying okular-21.08.1-optional-options.patch ... patching file CMakeLists.txt Hunk #1 succeeded at 84 (offset 8 lines). Hunk #2 FAILED at 95. 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-21.08.1-optional-options.patch Upstream commit (current HEAD, I updated yesterday and am on the previous commit): commit 3792d8d56 CommitDate: Fri Dec 17 22:03:35 2021 +0000 Tweak default UI It's desktop unless you're building for Android where the default it's mobile. You can still manually specify which UI you want and you'll get that regardless of the platform Only require KParts if we're building the desktop UI Two small changes in CI: * Stop pretending we have a macOS CI * Add Android CI - libkexiv2, khtml and kjs would be nice but we don't have Android builds yet That modifies CMakeLists.txt to conflict with our optional-options patch, resulting in the above error. Additionally, the KParts dep-change could have gentoo deps implications.
I knew I would regret making this patch.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=704b823c4258625299e78feba50b48112f9532a2 commit 704b823c4258625299e78feba50b48112f9532a2 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-12-20 15:40:21 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-12-20 15:40:21 +0000 kde-apps/okular: Rebase optional-options patch on top of 22.03.70 Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/829509 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../files/okular-22.03.70-optional-options.patch | 113 +++++++++++++++++++++ kde-apps/okular/okular-9999.ebuild | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-)
Please rebase the patch again for kde-apps/okular-9999. * Applying okular-22.04.0-optional-options.patch ... patching file CMakeLists.txt Hunk #1 FAILED at 91. Hunk #2 FAILED at 110. 2 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 /var/tmp/portage/kde-apps/okular-9999/files/okular-22.04.0-optional-options.patch *
(In reply to jospezial from comment #3) Reopening then... (I'll probably be updating tomorrow and would have come on it then. With any luck it'll already be fixed due to this. If not, I'll add my usual further detail like the upstream commit and what needs changed, then.)
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ae8e84212b45052fdd9113379c50994657839ff commit 5ae8e84212b45052fdd9113379c50994657839ff Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-05-09 05:33:22 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-05-09 05:38:38 +0000 kde-apps/okular: Drop obsolete patch Upstream commit 913d437822f23730d10bf97c3ed9201f936a33a2 Closes: https://bugs.gentoo.org/829509 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> kde-apps/okular/okular-9999.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
