From 5030a027981dffc84b766bb93a76da25865856c5 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 21 Nov 2020 20:37:50 +0100 Subject: app-office/libreoffice: Fix build with ICU-68 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner --- app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild index b6573bba320..7d33a2c844c 100644 --- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild @@ -286,14 +286,15 @@ else fi PATCHES=( - # backport from 7.0 branch - "${FILESDIR}/${PN}-7.0.3.1-fix-disable-pdfium-build.patch" - # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + + # 7.0 branch + "${FILESDIR}/${P}-fix-disable-pdfium-build.patch" + "${FILESDIR}/${PN}-6.4.7.2-icu-68-1.patch" # bug 752021 ) S="${WORKDIR}/${PN}-${MY_PV}" -- cgit v1.2.3