From 60cd34775e85aa3f7e970857f7a4c5dd2f863a2a Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Mon, 8 Nov 2021 22:49:44 +0000 Subject: harfbuzz 3.1.1 git-svn-id: svn://tug.org/texlive/trunk@60995 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/README | 4 +- Build/source/libs/harfbuzz/ChangeLog | 5 ++ Build/source/libs/harfbuzz/TLpatches/ChangeLog | 5 ++ Build/source/libs/harfbuzz/TLpatches/TL-Changes | 4 +- Build/source/libs/harfbuzz/configure | 24 ++++----- Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog | 60 ++++++++++++++++++++++ Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 7 +++ .../source/libs/harfbuzz/harfbuzz-src/configure.ac | 2 +- .../source/libs/harfbuzz/harfbuzz-src/meson.build | 2 +- .../libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh | 3 ++ .../libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc | 17 +++--- Build/source/libs/harfbuzz/version.ac | 2 +- 12 files changed, 110 insertions(+), 25 deletions(-) (limited to 'Build') diff --git a/Build/source/libs/README b/Build/source/libs/README index d2362e0a52e..bd427b36e0c 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -26,8 +26,8 @@ graphite2 1.3.14 - checked 10apr20 http://sourceforge.net/projects/silgraphite/files/graphite2/ (requires C++11) -harfbuzz 3.1.0 - checked 04nov21 - https://github.com/harfbuzz/harfbuzz/releases/download/3.1.0/ +harfbuzz 3.1.1 - checked 09nov21 + https://github.com/harfbuzz/harfbuzz/releases/download/3.1.1/ icu 68.2 - checked 13feb21 http://download.icu-project.org/files/icu4c/ diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 87c18daafe6..85522389825 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2021-11-09 Akira Kakuto + + Import harfbuzz-3.1.1. + * version.ac: Adjusted. + 2021-11-04 Akira Kakuto Import harfbuzz-3.1.0. diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index 721d647e9ad..115bae35001 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2021-11-09 Akira Kakuto + + Imported harfbuzz-3.1.1 source tree from: + https://github.com/harfbuzz/harfbuzz/releases/download/3.1.1/ + 2021-11-04 Akira Kakuto Imported harfbuzz-3.1.0 source tree from: diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index 113d280a440..d539649ac77 100644 --- a/Build/source/libs/harfbuzz/TLpatches/TL-Changes +++ b/Build/source/libs/harfbuzz/TLpatches/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the harfbuzz-3.1.0/ tree as obtained from: - https://github.com/harfbuzz/harfbuzz/releases/download/3.1.0/ +Changes applied to the harfbuzz-3.1.1/ tree as obtained from: + https://github.com/harfbuzz/harfbuzz/releases/download/3.1.1/ Removed: COPYING diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 5880d0fbd8e..f2806883d14 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.71 for harfbuzz (TeX Live) 3.1.0. +# Generated by GNU Autoconf 2.71 for harfbuzz (TeX Live) 3.1.1. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='3.1.0' -PACKAGE_STRING='harfbuzz (TeX Live) 3.1.0' +PACKAGE_VERSION='3.1.1' +PACKAGE_STRING='harfbuzz (TeX Live) 3.1.1' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1346,7 +1346,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) 3.1.0 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 3.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1418,7 +1418,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 3.1.0:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 3.1.1:";; esac cat <<\_ACEOF @@ -1523,7 +1523,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 3.1.0 +harfbuzz (TeX Live) configure 3.1.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2064,7 +2064,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 3.1.0, which was +It was created by harfbuzz (TeX Live) $as_me 3.1.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4823,7 +4823,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='3.1.0' + VERSION='3.1.1' # Some tools Automake needs. @@ -5035,8 +5035,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=3 HB_VERSION_MINOR=1 -HB_VERSION_MICRO=0 -HB_VERSION=3.1.0 +HB_VERSION_MICRO=1 +HB_VERSION=3.1.1 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8817,7 +8817,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 3.1.0, which was +This file was extended by harfbuzz (TeX Live) $as_me 3.1.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8885,7 +8885,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -harfbuzz (TeX Live) config.status 3.1.0 +harfbuzz (TeX Live) config.status 3.1.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index da10d70ac27..b21e5973a13 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,63 @@ +commit cd5c6cd0419ac5e4de975d6c476fb760bf06d2ce +Author: Khaled Hosny +Date: Mon Nov 8 06:59:55 2021 +0200 + + 3.1.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + meson.build | 2 +- + src/hb-version.h | 4 ++-- + 4 files changed, 11 insertions(+), 4 deletions(-) + +commit 1e07d42aa6259f73aed09f25dd37993974b9b366 +Author: Matthias Clasen +Date: Sun Nov 7 01:19:42 2021 -0400 + + Typo fix + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1fd7fd98235649115bba7407f2a2b977bf86733c +Author: Matthias Clasen +Date: Sat Nov 6 10:18:20 2021 -0400 + + Cosmetics: Avoid confusing indentation + + This line had me confused for a second because + the condition looked like a cast and the if just + looked misplaced. Add a line break to prevent + such confusion. + + src/hb-ot-layout.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3471f8f69e25ffebe96dc55173096cedc738ca6f +Author: Matthias Clasen +Date: Sat Nov 6 10:17:20 2021 -0400 + + docs: Clarify a doc comment + + Reword the docs for hb_ot_layout_script_select_language and + be a bit more specific about the returned index. + + src/hb-ot-layout.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 07dc34bdaf977a3be97ab5a68455ed7a67f80a06 +Author: Behdad Esfahbod +Date: Fri Nov 5 14:45:20 2021 -0700 + + [mutex] Try work around GCC cast-align error/warning + + Shouldn't be needed because of the alignas(). Oh well... + + Might fix https://github.com/harfbuzz/harfbuzz/issues/3283 + + src/hb-mutex.hh | 3 +++ + 1 file changed, 3 insertions(+) + commit 77eeec53a917554a2766a7cb1687607841282777 Author: Khaled Hosny Date: Wed Nov 3 23:31:03 2021 +0200 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 5fbdca8b123..da7d8db1d6f 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 3.1.1 +Wednesday, November 8, 2021 +==================================== +- Work around GCC cast-align error/warning on some platforms. (Behdad Esfahbod) +- Documentation improvements. (Matthias Clasen) + + Overview of changes leading to 3.1.0 Wednesday, November 3, 2021 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index 80e92b9696c..0acbba364f5 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], - [3.1.0], + [3.1.1], [https://github.com/harfbuzz/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/meson.build b/Build/source/libs/harfbuzz/harfbuzz-src/meson.build index d5487218263..cd7acff249f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/meson.build +++ b/Build/source/libs/harfbuzz/harfbuzz-src/meson.build @@ -1,6 +1,6 @@ project('harfbuzz', 'c', 'cpp', meson_version: '>= 0.52.0', - version: '3.1.0', + version: '3.1.1', default_options: [ 'cpp_rtti=false', # Just to support msvc, we are passing -fno-exceptions also anyway 'cpp_std=c++11', diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh index 4e135027f73..6914b224502 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-mutex.hh @@ -97,10 +97,13 @@ struct hb_mutex_t /* Create space for, but do not initialize m. */ alignas(hb_mutex_impl_t) char m[sizeof (hb_mutex_impl_t)]; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wcast-align" void init () { hb_mutex_impl_init ((hb_mutex_impl_t *) m); } void lock () { hb_mutex_impl_lock ((hb_mutex_impl_t *) m); } void unlock () { hb_mutex_impl_unlock ((hb_mutex_impl_t *) m); } void fini () { hb_mutex_impl_finish ((hb_mutex_impl_t *) m); } +#pragma GCC diagnostic pop }; struct hb_lock_t diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc index 1e446c66ff4..fbdedd0e209 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc @@ -613,7 +613,7 @@ hb_ot_layout_table_get_feature_tags (hb_face_t *face, * hb_ot_layout_table_find_feature: * @face: #hb_face_t to work upon * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS - * @feature_tag: The #hb_tag_t og the requested feature tag + * @feature_tag: The #hb_tag_t of the requested feature tag * @feature_index: (out): The index of the requested feature * * Fetches the index for a given feature tag in the specified face's GSUB table @@ -717,10 +717,14 @@ hb_ot_layout_script_find_language (hb_face_t *face, * @language_tags: The array of language tags * @language_index: (out): The index of the requested language * - * Fetches the index of a given language tag in the specified face's GSUB table - * or GPOS table, underneath the specified script index. + * Fetches the index of the first language tag fom @language_tags that is present + * in the specified face's GSUB or GPOS table, underneath the specified script + * index. * - * Return value: %true if the language tag is found, %false otherwise + * If none of the given language tags is found, %false is returned and + * @language_index is set to the default language index. + * + * Return value: %true if one of the given language tags is found, %false otherwise * * Since: 2.0.0 **/ @@ -746,7 +750,8 @@ hb_ot_layout_script_select_language (hb_face_t *face, if (s.find_lang_sys_index (HB_OT_TAG_DEFAULT_LANGUAGE, language_index)) return false; - if (language_index) *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX; + if (language_index) + *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX; return false; } @@ -1016,7 +1021,7 @@ struct hb_collect_features_context_t hb_set_t features_set; for (; *features; features++) features_set.add (*features); - + for (unsigned i = 0; i < g.get_feature_count (); i++) { hb_tag_t tag = g.get_feature_tag (i); diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index e7bb32dbeb7..43ced8f3ad5 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], [3.1.0]) +m4_define([harfbuzz_version], [3.1.1]) -- cgit v1.2.3