Update to 0.9.29:

Overview of changes leading to 0.9.29
Thursday, May 29, 2014
=====================================

- Implement cmap in hb-ot-font.h.  No variation-selectors yet.
- Myanmar: Allow MedialYa+Asat.
- Various Indic fixes:
  * Support most characters in Extended Devanagary and Vedic
    Unicode blocks.
  * Allow digits and a some punctuation as consonant placeholders.
- Build fixes.

4 files changed, 12 insertions, 31 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index c41b8193f55..27b2cd91b69 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2014/05/27 14:23:58 pho Exp $
+# $NetBSD: Makefile,v 1.35 2014/06/05 16:36:19 wiz Exp $
 
-DISTNAME=	harfbuzz-0.9.28
-PKGREVISION=	2
+DISTNAME=	harfbuzz-0.9.29
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo
index 248567fdb43..f78703a8a9f 100644
--- a/fonts/harfbuzz/distinfo
+++ b/fonts/harfbuzz/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.24 2014/05/05 10:27:28 tron Exp $
+$NetBSD: distinfo,v 1.25 2014/06/05 16:36:19 wiz Exp $
 
-SHA1 (harfbuzz-0.9.28.tar.bz2) = e2704c0b1b76a82fb8b5c9b354526733629ee616
-RMD160 (harfbuzz-0.9.28.tar.bz2) = 5d98717a86d2a7c77f0833f32324e8e7e9a99b32
-Size (harfbuzz-0.9.28.tar.bz2) = 1063769 bytes
-SHA1 (patch-src_hb-coretext.h) = 67ab91fefbac3fe8e65a3d71ecb5dd5f9473df04
-SHA1 (patch-src_hb-open-type-private.hh) = 876f1afdf2c7babb4cd3c2b9c9e4635167ad1021
+SHA1 (harfbuzz-0.9.29.tar.bz2) = fbb4e533f0f838c456fbe37751ec2dbf95c8e182
+RMD160 (harfbuzz-0.9.29.tar.bz2) = 87e8488345fe4902ac30976a48aec7c893bf1539
+Size (harfbuzz-0.9.29.tar.bz2) = 1066222 bytes
+SHA1 (patch-src_hb-open-type-private.hh) = c644d62bafd3e10d25ce26070fd2a8691e9757ec
diff --git a/fonts/harfbuzz/patches/patch-src_hb-coretext.h b/fonts/harfbuzz/patches/patch-src_hb-coretext.h
deleted file mode 100644
index c00134c5d99..00000000000
--- a/fonts/harfbuzz/patches/patch-src_hb-coretext.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_hb-coretext.h,v 1.1 2014/05/05 10:27:28 tron Exp $
-
-Fix build under Mac OS X:
-
-https://bugs.freedesktop.org/show_bug.cgi?id=78291
-
---- src/hb-coretext.h.orig	2014-03-21 17:29:34.000000000 +0000
-+++ src/hb-coretext.h	2014-05-05 11:15:26.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "hb.h"
- 
- #include <TargetConditionals.h>
--#if defined(TARGET_OS_IPHONE)
-+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
- #  include <CoreText/CoreText.h>
- #  include <CoreGraphics/CoreGraphics.h>
- #else
diff --git a/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh b/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh
index 9dc45e179be..f790a115534 100644
--- a/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh
+++ b/fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_hb-open-type-private.hh,v 1.2 2013/07/07 10:23:14 wiz Exp $
+$NetBSD: patch-src_hb-open-type-private.hh,v 1.3 2014/06/05 16:36:19 wiz Exp $
 
 Fix build with gcc 4.2.1 of FreeBSD 9.1.
 
 Patch is taken from
 https://build.opensuse.org/package/view_file?file=mozilla-gcc43.patch&package=MozillaFirefox&project=home%3AWernerFink%3Abranches%3Amozilla
 
---- src/hb-open-type-private.hh.orig	2013-01-08 22:13:42.000000000 +0000
+--- src/hb-open-type-private.hh.orig	2014-05-14 01:47:24.000000000 +0000
 +++ src/hb-open-type-private.hh
-@@ -941,6 +941,11 @@ struct HeadlessArrayOf
+@@ -958,6 +958,11 @@ struct HeadlessArrayOf
    DEFINE_SIZE_ARRAY (sizeof (USHORT), array);
  };
  
@@ -18,8 +18,8 @@ https://build.opensuse.org/package/view_file?file=mozilla-gcc43.patch&package=Mo
 +#endif
  
  /* An array with sorted elements.  Supports binary searching. */
- template <typename Type>
-@@ -968,5 +973,8 @@ struct SortedArrayOf : ArrayOf<Type> {
+ template <typename LenType, typename Type>
+@@ -990,5 +995,8 @@ struct SortedArrayOf : GenericSortedArra
  
  } /* namespace OT */