From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCE56138359 for ; Fri, 6 Nov 2020 02:22:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02D49E0864; Fri, 6 Nov 2020 02:22:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF943E0864 for ; Fri, 6 Nov 2020 02:22:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66D2C335CF5 for ; Fri, 6 Nov 2020 02:22:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEB623BC for ; Fri, 6 Nov 2020 02:22:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1604629313.6229e6d13f5af9ecc6a437e6218cca9cd5f96056.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch app-office/libreoffice/libreoffice-6.4.7.2.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6229e6d13f5af9ecc6a437e6218cca9cd5f96056 X-VCS-Branch: master Date: Fri, 6 Nov 2020 02:22:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7bf611ed-76a5-421a-9972-2c3af9fb0d17 X-Archives-Hash: 4da97655c184b5aa080b738c426c84f5 commit: 6229e6d13f5af9ecc6a437e6218cca9cd5f96056 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 6 01:55:57 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 fireburn.co.uk> Closes: https://bugs.gentoo.org/752021 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner 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 +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 +--- + 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}"