[HarfBuzz] harfbuzz: Branch 'master' - 3 commits

[Behdad Esfahbod]

 configure.ac         |    3 ++-
 src/check-symbols.sh |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 331c46c79b4d18cb4948be12c78ebb71a143e7ac
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 11 13:45:22 2016 -0700

    Fix configure on iOS
    
    Fixes https://github.com/behdad/harfbuzz/issues/342

diff --git a/configure.ac b/configure.ac
index 235afe7..14c86b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,7 +414,8 @@ if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then
 	else
 		# On iOS CoreText and CoreGraphics are stand-alone frameworks
 		if test "x$have_coretext" != "xtrue"; then
-			AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
+			# Check for a different symbol to avoid getting cached result.
+			AC_CHECK_TYPE(CTRunRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
 		fi
 
 		if $have_coretext; then
commit f6e194e77a2c34cd118b47c0d73a22afde85dfda
Merge: 7201fdd bef240b
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Tue Oct 11 17:23:41 2016 +0330

    Merge pull request #344 from ebraminio/fixmacci
    
    [ci] Whitelist more symbols and unbreak mac CI

commit bef240b36ee9086b0d92e351e4c5118c0bbb5df6
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Mon Oct 10 17:27:52 2016 +0330

    [ci] Whitelist more symbols and unbreak mac CI
    
    Thanks to @khaledhosny, actually this is his work :)

diff --git a/src/check-symbols.sh b/src/check-symbols.sh
index b2bf43f..ba09ba1 100755
--- a/src/check-symbols.sh
+++ b/src/check-symbols.sh
@@ -19,8 +19,8 @@ tested=false
 for suffix in so dylib; do
 	so=.libs/libharfbuzz.$suffix
 	if ! test -f "$so"; then continue; fi
-	
-	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`"
+
+	EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| ___gcov_flush\>\| llvm_\| _llvm_' | cut -d' ' -f3`"
 
 	prefix=`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`