diff options
| -rw-r--r-- | Build/source/libs/harfbuzz/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/libs/harfbuzz/configure | 22 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog | 48 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 7 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/configure.ac | 12 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc | 3 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/version.ac | 2 |
9 files changed, 91 insertions, 15 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 44768191e6c..65bc8a006ca 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2016-09-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import harfbuzz-1.3.2. + * version.ac: Adjusted. + 2016-09-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import harfbuzz-1.3.1. diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index cdaf064eee5..79e1df2f6af 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.3.1. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.3.2. # # Report bugs to <tex-k@tug.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='harfbuzz (TeX Live) 1.3.1' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='harfbuzz (TeX Live) 1.3.2' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures harfbuzz (TeX Live) 1.3.1 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.3.1:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.3.2:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 1.3.1 +harfbuzz (TeX Live) configure 1.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2080,7 +2080,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by harfbuzz (TeX Live) $as_me 1.3.1, which was +It was created by harfbuzz (TeX Live) $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4003,7 +4003,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='1.3.1' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -4207,7 +4207,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=1 HB_VERSION_MINOR=2 HB_VERSION_MICRO=7 -HB_VERSION=1.3.1 +HB_VERSION=1.3.2 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6866,7 +6866,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by harfbuzz (TeX Live) $as_me 1.3.1, which was +This file was extended by harfbuzz (TeX Live) $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6932,7 +6932,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -harfbuzz (TeX Live) config.status 1.3.1 +harfbuzz (TeX Live) config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog index e21862cdeec..0b19ae47df4 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2016-09-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Imported harfbuzz-1.3.2 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2016-09-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Imported harfbuzz-1.3.1 source tree from: diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes index b976df434fd..d5111a80969 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes +++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the harfbuzz-1.3.1/ tree as obtained from: +Changes applied to the harfbuzz-1.3.2/ tree as obtained from: http://www.freedesktop.org/software/harfbuzz/release/ Removed: 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); diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index a0e058da46f..a8916c3aebd 100644 --- a/Build/source/libs/harfbuzz/version.ac +++ b/Build/source/libs/harfbuzz/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current harfbuzz version -m4_define([harfbuzz_version], [1.3.1]) +m4_define([harfbuzz_version], [1.3.2]) |