From 0634d5600e559a69a92d49173ffb8e715fe7576c Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 16 Aug 2016 02:49:48 +0200 Subject: [PATCH 1/2] [travis] Fix MacOS libtool issue Reveals another MacOS build breakage in the Core Text shaper. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f37b4b228..1b150584e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user cpp-coveralls; fi # for coveralls.io code coverage tracking - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$HOME/.local/bin:$PATH; fi # Make sure we can find the above Python packages - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi; + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew uninstall libtool && brew install libtool; fi # Workaround Travis/brew bug - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ragel freetype glib gobject-introspection cairo icu4c graphite2; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew link --force icu4c; fi # icu4c is keg-only script: From a0f1b44b6c0e3b1e6a1ba63dde2be22e0425353f Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 16 Aug 2016 03:09:04 +0200 Subject: [PATCH 2/2] [coretext] Blind fix for build on MacOS 10.9 --- src/hb-coretext.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 3e56f15b1..9e24e9063 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -150,7 +150,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size) * bug indicate that the cascade list reconfiguration occasionally causes * crashes in CoreText on OS X 10.9, thus let's skip this step on older * operating system versions. */ - if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() < kCTVersionNumber10_10) + if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() <= kCTVersionNumber10_9) return ct_font; CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, kCTFontURLAttribute);