diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-21 20:37:50 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-21 23:17:10 +0100 |
commit | 5030a027981dffc84b766bb93a76da25865856c5 (patch) | |
tree | f268cc81b79246a5ae4752fb526ceb6bd46c2438 /app-office/libreoffice | |
parent | dev-python/pyqtgraph: support python3_9 (diff) | |
download | gentoo-5030a027981dffc84b766bb93a76da25865856c5.tar.gz gentoo-5030a027981dffc84b766bb93a76da25865856c5.tar.bz2 gentoo-5030a027981dffc84b766bb93a76da25865856c5.zip |
app-office/libreoffice: Fix build with ICU-68
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 7 |
1 files 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 b6573bba320b..7d33a2c844ce 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}" |