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 2131F138359 for ; Sat, 21 Nov 2020 22:18:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A4FFE05C1; Sat, 21 Nov 2020 22:18:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 21759E05C1 for ; Sat, 21 Nov 2020 22:18:05 +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 D57D6340C04 for ; Sat, 21 Nov 2020 22:18:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56F932CA for ; Sat, 21 Nov 2020 22:18:02 +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: <1605997030.5030a027981dffc84b766bb93a76da25865856c5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-7.0.3.1.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5030a027981dffc84b766bb93a76da25865856c5 X-VCS-Branch: master Date: Sat, 21 Nov 2020 22:18:02 +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: ecf78f83-0d07-4326-b36a-f999b143b01f X-Archives-Hash: 99604583202ef1c35ba4987294dd56ea commit: 5030a027981dffc84b766bb93a76da25865856c5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 21 19:37:50 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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}"