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 49B0813997D for ; Sun, 10 Nov 2019 10:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75FE0E09F3; Sun, 10 Nov 2019 10:30:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 84CE7E09F1 for ; Sun, 10 Nov 2019 10:30:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7BA1434CB78 for ; Sat, 9 Nov 2019 15:49:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8C558A7 for ; Sat, 9 Nov 2019 15:49:49 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1573314583.5e2c1c13fa388533d075554da87d3641019aa739.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch media-libs/harfbuzz/harfbuzz-2.6.1.ebuild X-VCS-Directories: media-libs/harfbuzz/ media-libs/harfbuzz/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 5e2c1c13fa388533d075554da87d3641019aa739 X-VCS-Branch: master Date: Sat, 9 Nov 2019 15:49:49 +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: 80d2aa4b-1bed-4392-8946-cb09adbccc3a X-Archives-Hash: 934f48262f978ad322f0a1c91e3b7240 commit: 5e2c1c13fa388533d075554da87d3641019aa739 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Nov 9 15:49:20 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Nov 9 15:49:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2c1c13 media-libs/harfbuzz: fux current stable against gcc-9 Fix build failure on gcc-9. It's a slightly less invasive version of upstream's commit 2dce85ed06a8cc7ca ("[icu] Remove HB_ICU_STMT (#1993)") Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich gentoo.org> media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch | 14 ++++++++++++++ media-libs/harfbuzz/harfbuzz-2.6.1.ebuild | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch new file mode 100644 index 00000000000..c16fedd6d9d --- /dev/null +++ b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch @@ -0,0 +1,14 @@ +Fix build failure on gcc-9. It's a slightly less invasive +version of upstream's commit 2dce85ed06a8cc7ca +("[icu] Remove HB_ICU_STMT (#1993)") +--- a/src/hb-icu.cc ++++ b/src/hb-icu.cc +@@ -53,7 +53,7 @@ + + /* ICU doesn't do-while(0) around their statements. Ugh! + * https://unicode-org.atlassian.net/browse/CLDR-13027 */ +-#define HB_ICU_STMT(S) do { S } while (0) ++#define HB_ICU_STMT(S) do { S; } while (0) + + hb_script_t + hb_icu_script_to_script (UScriptCode script) diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild index d8eb3a9c894..87e7095493c 100644 --- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild @@ -48,6 +48,10 @@ if [[ ${PV} = 9999 ]] ; then " fi +PATCHES=( + "${FILESDIR}"/${P}-gcc-9.patch +) + pkg_setup() { use test && python-any-r1_pkg_setup if ! use debug ; then