diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-06 02:55:57 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-06 03:21:53 +0100 |
| commit | 6229e6d13f5af9ecc6a437e6218cca9cd5f96056 (patch) | |
| tree | 30966cd7dd63b6584706212c8490680ca14ef6ff | |
| parent | sys-apps/fwupd: add ~ppc64 keyword (diff) | |
| download | gentoo-6229e6d13f5af9ecc6a437e6218cca9cd5f96056.tar.gz gentoo-6229e6d13f5af9ecc6a437e6218cca9cd5f96056.tar.bz2 gentoo-6229e6d13f5af9ecc6a437e6218cca9cd5f96056.zip | |
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@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@gentoo.org>
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch (renamed from app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch) | 0 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch | 28 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 2 |
3 files changed, 29 insertions, 1 deletions
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 index fe20e3435d2a..fe20e3435d2a 100644 --- 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 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 000000000000..bd7dc04cffe5 --- /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 <asturm@gentoo.org> +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 <asturm@gentoo.org> +--- + 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 e1f48dbe39fe..e632c848c589 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}" |