Update harfbuzz to 2.3.0.

-   Fix regression on big-endian architectures. Ouch!
-   Misc bug and build fixes.
-   Fix subsetting of simple GSUB/GDEF.
-   Merge CFF / CFF2 support contributed by Adobe. This mostly involves
    the subsetter, but also get_glyph_extents on CFF fonts.

4 files changed, 17 insertions, 15 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index b4e537b0aaf..4914bdae194 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2019/01/24 12:46:10 he Exp $
+# $NetBSD: Makefile,v 1.107 2019/01/29 18:54:03 bsiegert Exp $
 
-DISTNAME=	harfbuzz-2.2.0
-PKGREVISION=	1
+DISTNAME=	harfbuzz-2.3.0
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index 22086bb3572..4f4c62f31d7 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2018/12/03 11:43:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/01/29 18:54:03 bsiegert Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
@@ -16,6 +16,7 @@ include/harfbuzz/hb-glib.h
 ${PLIST.icu}include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-map.h
 include/harfbuzz/hb-ot-color.h
+include/harfbuzz/hb-ot-deprecated.h
 include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-math.h
@@ -86,6 +87,7 @@ share/gtk-doc/html/harfbuzz/ch03s03.html
 share/gtk-doc/html/harfbuzz/ch09.html
 share/gtk-doc/html/harfbuzz/ch10.html
 share/gtk-doc/html/harfbuzz/ch11.html
+share/gtk-doc/html/harfbuzz/ch12.html
 share/gtk-doc/html/harfbuzz/clusters.html
 share/gtk-doc/html/harfbuzz/complex-scripts.html
 share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html
@@ -93,6 +95,7 @@ share/gtk-doc/html/harfbuzz/deprecated-api-index.html
 share/gtk-doc/html/harfbuzz/fonts-and-faces.html
 share/gtk-doc/html/harfbuzz/getting-started.html
 share/gtk-doc/html/harfbuzz/graphite-shaping.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-aat-layout.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
 share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo
index 7a5078b597c..1c7f441db57 100644
--- a/fonts/harfbuzz/distinfo
+++ b/fonts/harfbuzz/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.82 2018/12/03 11:43:25 wiz Exp $
+$NetBSD: distinfo,v 1.83 2019/01/29 18:54:03 bsiegert Exp $
 
-SHA1 (harfbuzz-2.2.0.tar.bz2) = 6cf14715b28e4bb0e39773d11c60db50b64db933
-RMD160 (harfbuzz-2.2.0.tar.bz2) = 63a65304913d8b551f60708600c708acc88bc982
-SHA512 (harfbuzz-2.2.0.tar.bz2) = 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
-Size (harfbuzz-2.2.0.tar.bz2) = 4506619 bytes
-SHA1 (patch-src_hb.hh) = 368b8f553b8d9a77b8122e861249c5e4eb4d9223
+SHA1 (harfbuzz-2.3.0.tar.bz2) = 68486b8902c5748c8cf0920e288f83fbf126a86c
+RMD160 (harfbuzz-2.3.0.tar.bz2) = c2a6c2a16cac38e150bd05c881de933fa33e1782
+SHA512 (harfbuzz-2.3.0.tar.bz2) = 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
+Size (harfbuzz-2.3.0.tar.bz2) = 17909479 bytes
+SHA1 (patch-src_hb.hh) = bb56d18e9303d597e485c86b413e4cbc28aa7c70
diff --git a/fonts/harfbuzz/patches/patch-src_hb.hh b/fonts/harfbuzz/patches/patch-src_hb.hh
index dfae6ce9505..afb58e5a066 100644
--- a/fonts/harfbuzz/patches/patch-src_hb.hh
+++ b/fonts/harfbuzz/patches/patch-src_hb.hh
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_hb.hh,v 1.1 2018/11/23 09:50:55 abs Exp $
+$NetBSD: patch-src_hb.hh,v 1.2 2019/01/29 18:54:03 bsiegert Exp $
 
 Do not play _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions
 
---- src/hb.hh.orig	2018-11-04 01:41:46.000000000 +0000
+--- src/hb.hh.orig	2018-12-18 03:36:12.000000000 +0000
 +++ src/hb.hh
-@@ -35,7 +35,7 @@
- #include "config.h"
+@@ -59,7 +59,7 @@
+ # define __EXTENSIONS__ 1
  #endif
  
 -#ifndef _POSIX_C_SOURCE
-+#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__)
++#if !defined (_POSIX_C_SOURCE) && !defined (__NetBSD__)
  #define _POSIX_C_SOURCE 200809L
  #endif