commit: 6229e6d13f5af9ecc6a437e6218cca9cd5f96056 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 6 01:55:57 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 6 02:21:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6229e6d1
app-office/libreoffice: Add second part of ICU-68 fix Not part of upstream's ICU-68 commit 0b14b9ec because it was already changed to use standard true in git master and libreoffice-7-0 branch beforehand. Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk> Closes: https://bugs.gentoo.org/752021 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...68.patch => libreoffice-6.4.7.2-icu-68-1.patch} | 0 .../files/libreoffice-6.4.7.2-icu-68-2.patch | 28 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch similarity index 100% rename from app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch rename to app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch new file mode 100644 index 00000000000..bd7dc04cffe --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch @@ -0,0 +1,28 @@ +From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Fri, 6 Nov 2020 02:43:07 +0100 +Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing + from 0b14b9ec) + +Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3 +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + svx/source/dialog/fntctrl.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx +index d312d7ad5f49..10c84ca95222 100644 +--- a/svx/source/dialog/fntctrl.cxx ++++ b/svx/source/dialog/fntctrl.cxx +@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack + rCTLFont.SetFillColor( rColor ); + } + else +- bTransparent = TRUE; ++ bTransparent = true; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent ); +-- +2.29.2 + diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild index e1f48dbe39f..e632c848c58 100644 --- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild @@ -274,7 +274,7 @@ PATCHES=( # git master "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806 "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574 - "${FILESDIR}/${P}-icu-68.patch" # bug 752021 + "${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport ) S="${WORKDIR}/${PN}-${MY_PV}"
