[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Sturmlechner]

commit:     5030a027981dffc84b766bb93a76da25865856c5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 19:37:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 22:17:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5030a027

app-office/libreoffice: Fix build with ICU-68

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 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}"