>>> Preparing source in /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 ... * Applying libreoffice-5.3.4.2-kioclient5.patch ... [ ok ] * Applying libreoffice-6.1-nomancompress.patch ... [ ok ] * Applying libreoffice-7.0.3.1-qt5detect.patch ... patching file configure.ac Hunk #1 FAILED at 11819. Hunk #2 succeeded at 12683 (offset 797 lines). 1 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej [ !! ] * ERROR: app-office/libreoffice-9999::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-7.0.3.1-qt5detect.patch * * Call stack: * ebuild.sh, line 127: Called src_prepare * environment, line 6168: Called default * phase-functions.sh, line 857: Called default_src_prepare * phase-functions.sh, line 922: Called __eapi6_src_prepare * environment, line 740: Called eapply '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-5.3.4.2-kioclient5.patch' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-6.1-nomancompress.patch' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-7.0.3.1-qt5detect.patch' * environment, line 2445: Called _eapply_patch '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-7.0.3.1-qt5detect.patch' * environment, line 2383: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-7.0.3.1-qt5detect.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" It looks as Hunk #1 was changed (fixed?) upstream with https://github.com/LibreOffice/core/commit/f90c68316c622971706568303a025bbc58351df3
Created attachment 711243 [details, diff] libreoffice-7.2.0.0-qt5detect.patch I made a new patch with git diff from configure.ac after Hunk #2 of libreoffice-7.0.3.1-qt5detect.patch succeeded.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a77107795dec3091f09a1a064fed25eac68ebb6 commit 8a77107795dec3091f09a1a064fed25eac68ebb6 Author: Nils Freydank <holgersson@posteo.de> AuthorDate: 2021-09-07 07:21:37 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-09-07 18:28:29 +0000 app-office/libreoffice: Update live ebuild Upstream uses media-libs/zxing-cpp now instead of qrcodegen. This bump reflects this change plus some other bumps like skia and some housekeeping. Thanks alot for the hints via bug reports by a fellow user! Thanks-To: jospezial Closes: https://bugs.gentoo.org/792093 Closes: https://bugs.gentoo.org/792096 Closes: https://bugs.gentoo.org/792099 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Nils Freydank <holgersson@posteo.de> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> app-office/libreoffice/Manifest | 1 + .../libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch | 13 +++++++++++++ app-office/libreoffice/libreoffice-9999.ebuild | 11 ++++------- 3 files changed, 18 insertions(+), 7 deletions(-)
