diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-28 08:30:51 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-28 08:30:51 +0000 |
commit | 5dda0181091688ae7ceac1836091eb72572325a6 (patch) | |
tree | 16bb4da7933f4c77c232e1a1f24e23dd5f10e3f2 /Build/source/libs/harfbuzz/harfbuzz-src | |
parent | 979d4357e205dcc00d676beccd40b25ccd226e3f (diff) |
harfbuzz 1.3.2
git-svn-id: svn://tug.org/texlive/trunk@42170 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src')
4 files changed, 68 insertions, 2 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index c148ab06f8a..0241bbc8849 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,51 @@ +commit f16bf6c2dacf5b9c82b2d1ffacc092cc396189a7 +Author: Phil Krylov <phil.krylov@gmail.com> +Date: Tue Sep 27 12:38:49 2016 +0200 + + Allow building with graphite2 without pkg-config (#318) + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 02bfd965af588640250c47f344ad3096c8a373e0 +Author: Gregory Morse <gregory.morse@live.com> +Date: Mon Sep 12 10:22:15 2016 +0200 + + Update detectenv-msvc.mak (#316) + + Windows x86 ARM capability + + win32/detectenv-msvc.mak | 3 +++ + 1 file changed, 3 insertions(+) + +commit fc4e671f311241e21c1cc3ed941b1fc651875a2e +Author: Ebrahim Byagowi <ebrahim@gnu.org> +Date: Fri Sep 9 23:28:28 2016 +0430 + + [coretext] Use intended coretext version check logic (#315) + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 48677345281a93d8829dd37d0480a6062945416a +Author: Khaled Hosny <khaledhosny@eglug.org> +Date: Thu Sep 8 04:44:37 2016 +0300 + + Try to unbreak building on older macOS again (#314) + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d22ab6cf040467e7f17476ccdfe9cab4dce16639 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Sep 7 14:28:47 2016 -0700 + + 1.3.1 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + commit b717cd7be506217e466e32a456df9af4d2720c0c Author: Dominik Röttsches <d-r@roettsches.de> Date: Wed Sep 7 23:56:57 2016 +0300 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 52686870c31..ae0926e6391 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,10 @@ +Overview of changes leading to 1.3.2 +Wednesday, September 27, 2016 +==================================== + +- Fix build of hb-coretext on older OS X versions. + + Overview of changes leading to 1.3.1 Wednesday, September 7, 2016 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index ea6fc27cb9c..57e9e6db67f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [1.3.1], + [1.3.2], [https://github.com/behdad/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) @@ -307,6 +307,16 @@ GRAPHITE2_DEPS="graphite2" AC_SUBST(GRAPHITE2_DEPS) if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then PKG_CHECK_MODULES(GRAPHITE2, $GRAPHITE2_DEPS, have_graphite2=true, :) + if test "x$have_graphite2" != "xtrue"; then + # If pkg-config is not available, graphite2 can still be there + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GRAPHITE2_CFLAGS" + CPPFLAGS="$CPPFLAGS $GRAPHITE2_CFLAGS" + AC_CHECK_HEADER(graphite2/Segment.h, have_graphite2=true, :) + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + fi fi if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc index ee7f91cc9a7..507581bd7b7 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc @@ -152,7 +152,8 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size) * operating system versions. Except for the emoji font, where _not_ * reconfiguring the cascade list causes CoreText crashes. For details, see * crbug.com/549610 */ - if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() < kCTVersionNumber10_10) { + // 0x00070000 stands for "kCTVersionNumber10_10", see CoreText.h + if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() < 0x00070000) { CFStringRef fontName = CTFontCopyPostScriptName (ct_font); bool isEmojiFont = CFStringCompare (fontName, CFSTR("AppleColorEmoji"), 0) == kCFCompareEqualTo; CFRelease (fontName); |