From 9139d285da34f265af4e9839a69f90fe04e5e764 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 9 Aug 2018 09:18:27 +0000 Subject: harfbuzz 1.8.7 git-svn-id: svn://tug.org/texlive/trunk@48381 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/harfbuzz/ChangeLog | 5 +++ Build/source/libs/harfbuzz/TLpatches/ChangeLog | 5 +++ Build/source/libs/harfbuzz/TLpatches/TL-Changes | 2 +- Build/source/libs/harfbuzz/configure | 24 ++++++------ Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog | 45 ++++++++++++++++++++++ Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 6 +++ .../source/libs/harfbuzz/harfbuzz-src/RELEASING.md | 3 ++ .../source/libs/harfbuzz/harfbuzz-src/configure.ac | 2 +- .../harfbuzz-src/src/hb-machinery-private.hh | 12 +++++- Build/source/libs/harfbuzz/version.ac | 2 +- 10 files changed, 89 insertions(+), 17 deletions(-) (limited to 'Build/source/libs/harfbuzz') diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 3ef5e4b57eb..ec41cac0aba 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2018-08-09 Akira Kakuto + + Import harfbuzz-1.8.7. + * version.ac: Adjusted. + 2018-08-07 Akira Kakuto Import harfbuzz-1.8.6. diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index 3c9fe1b4162..5fe9d972cfe 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2018-08-09 Akira Kakuto + + Imported harfbuzz-1.8.7 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2018-08-07 Akira Kakuto Imported harfbuzz-1.8.6 source tree from: diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index 571498ea442..5b1920c3e39 100644 --- a/Build/source/libs/harfbuzz/TLpatches/TL-Changes +++ b/Build/source/libs/harfbuzz/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the harfbuzz-1.8.6/ tree as obtained from: +Changes applied to the harfbuzz-1.8.7/ tree as obtained from: http://www.freedesktop.org/software/harfbuzz/release/ Removed: diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 867118c7d15..22dfe9adf79 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.8.6. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.8.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='1.8.6' -PACKAGE_STRING='harfbuzz (TeX Live) 1.8.6' +PACKAGE_VERSION='1.8.7' +PACKAGE_STRING='harfbuzz (TeX Live) 1.8.7' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1317,7 +1317,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.8.6 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 1.8.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1388,7 +1388,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.8.6:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.8.7:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 1.8.6 +harfbuzz (TeX Live) configure 1.8.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2131,7 +2131,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.8.6, which was +It was created by harfbuzz (TeX Live) $as_me 1.8.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4054,7 +4054,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='1.8.6' + VERSION='1.8.7' # Some tools Automake needs. @@ -4248,8 +4248,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=1 HB_VERSION_MINOR=8 -HB_VERSION_MICRO=6 -HB_VERSION=1.8.6 +HB_VERSION_MICRO=7 +HB_VERSION=1.8.7 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8140,7 +8140,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.8.6, which was +This file was extended by harfbuzz (TeX Live) $as_me 1.8.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8206,7 +8206,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.8.6 +harfbuzz (TeX Live) config.status 1.8.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index 4b0b64c8cc6..cc6f946d4f8 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,48 @@ +commit b6fdcf4f8bd09e065c767939125861c9dc8ff18f +Author: Behdad Esfahbod +Date: Wed Aug 8 21:54:08 2018 -0700 + + 1.8.7 + + NEWS | 6 ++++++ + RELEASING.md | 3 +++ + configure.ac | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 12 insertions(+), 3 deletions(-) + +commit 51ffc3e65aacbece63995be99e2bc20538e3eb75 +Author: Behdad Esfahbod +Date: Wed Aug 8 22:01:04 2018 -0700 + + Fix previous commit to use atomic operations + + src/hb-machinery-private.hh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 883957688cc4aa4335e5131a60b3ac3b53290726 +Author: Behdad Esfahbod +Date: Wed Aug 8 21:42:18 2018 -0700 + + Fix assertion failure + + https://bugzilla.mozilla.org/show_bug.cgi?id=1476334 + + src/hb-machinery-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e49a38b20e82e50bca96751470e945cbe0524880 +Author: Behdad Esfahbod +Date: Tue Aug 7 09:55:42 2018 -0700 + + 1.8.6 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + src/hb-font.cc | 6 +++--- + src/hb-font.h | 4 ++-- + src/hb-version.h | 4 ++-- + 5 files changed, 23 insertions(+), 8 deletions(-) + commit b0ff79acd804e47a2a3db73746cf9c6dc986950a Author: Behdad Esfahbod Date: Tue Aug 7 09:52:06 2018 -0700 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index e97a501d5ed..87907ca8cc5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,9 @@ +Overview of changes leading to 1.8.7 +Wednesday, August 8, 2018 +==================================== +- Fix assertion failure with GDEF-blacklisted fonts. + + Overview of changes leading to 1.8.6 Tuesday, August 7, 2018 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/RELEASING.md b/Build/source/libs/harfbuzz/harfbuzz-src/RELEASING.md index c57f8466a2d..d431871c0ac 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/RELEASING.md +++ b/Build/source/libs/harfbuzz/harfbuzz-src/RELEASING.md @@ -25,6 +25,9 @@ HarfBuzz release walk-through checklist: 6. Do "make distcheck", if it passes, you get a tarball. Otherwise, fix things and commit them separately before making release, + Note: Check src/hb-version.h and make sure the new version number is + there. Sometimes, it does not get updated. If that's the case, + "touch configure.ac" and rebuild. TODO: debug. 7. "make release-files". Enter your GPG password. This creates a sha256 hash and signs it. diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index c03d79dc57a..a32b863261c 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.8.6], + [1.8.7], [https://github.com/harfbuzz/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery-private.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery-private.hh index 119625c45a2..ec41e2bcf69 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery-private.hh @@ -639,8 +639,16 @@ struct hb_lazy_loader_t inline void set_stored (Stored *instance_) { - assert (instance == nullptr); - instance = instance_; + /* This *must* be called when there are no other threads accessing. + * However, to make TSan, etc, happy, we using cmpexch. */ + retry: + Stored *p = (Stored *) hb_atomic_ptr_get (&this->instance); + if (p) + { + if (unlikely (!hb_atomic_ptr_cmpexch (const_cast(&this->instance), p, instance_))) + goto retry; + thiz ()->destroy (p); + } } inline const Returned * get (void) const diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index 98390259f5d..1e28cff0888 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.8.6]) +m4_define([harfbuzz_version], [1.8.7]) -- cgit v1.2.3