[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/

[Sergei Trofimovich]

commit:     5e2c1c13fa388533d075554da87d3641019aa739
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 15:49:20 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 <slyfox <AT> 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