HarfBuzz 1.2.5

git-svn-id: svn://tug.org/texlive/trunk@40244 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 90 insertions, 21 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 2d0a33cb1b8..aae337699e4 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -24,7 +24,7 @@ gmp 6.1.0 - checked 28dec15
 graphite2 1.3.8 - checked 31mar16
   http://sourceforge.net/projects/silgraphite/files/graphite2/
 
-harfbuzz 1.2.4 - checked 17mar16
+harfbuzz 1.2.5 - checked 05apr16
   http://www.freedesktop.org/software/harfbuzz/release/
 
 icu 57.1 (release) - checked 27mar16
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 3b78c920de6..8347f1f1783 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import harfbuzz-1.2.5.
+	* version.ac: Adjusted.
+
 2016-03-17  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import harfbuzz-1.2.4.
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index 0ac47b76423..231e22ae567 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.2.4.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.2.5.
 #
 # 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.2.4'
-PACKAGE_STRING='harfbuzz (TeX Live) 1.2.4'
+PACKAGE_VERSION='1.2.5'
+PACKAGE_STRING='harfbuzz (TeX Live) 1.2.5'
 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.2.4 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 1.2.5 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.2.4:";;
+     short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.2.5:";;
    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.2.4
+harfbuzz (TeX Live) configure 1.2.5
 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.2.4, which was
+It was created by harfbuzz (TeX Live) $as_me 1.2.5, 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.2.4'
+ VERSION='1.2.5'
 
 
 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=4
-HB_VERSION=1.2.4
+HB_VERSION=1.2.5
 
 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.2.4, which was
+This file was extended by harfbuzz (TeX Live) $as_me 1.2.5, 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.2.4
+harfbuzz (TeX Live) config.status 1.2.5
 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 28d0adf80a9..5f5fce1f4a9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Imported harfbuzz-1.2.5 source tree from:
+	  http://www.freedesktop.org/software/harfbuzz/release/
+
 2016-03-17  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Imported harfbuzz-1.2.4 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
index a3760bea275..a04daba7f83 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.2.4/ tree as obtained from:
+Changes applied to the harfbuzz-1.2.5/ 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 9d5e054e30d..b53b1bff1ef 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
@@ -1,3 +1,57 @@
+commit ba8370d07317e0103f1fd486524774d415056186
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 4 16:25:32 2016 -0700
+
+    1.2.5
+
+ NEWS | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit 6e55199b5f097ac93bad38f32e9813e2da14c5a7
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 4 16:24:27 2016 -0700
+
+    Add test for 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8
+
+ test/shaping/Makefile.am                                |   1 +
+ .../f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf        | Bin 0 ->
+ 16736 bytes
+ test/shaping/tests/mark-filtering-sets.tests            |   5 +++++
+ 3 files changed, 6 insertions(+)
+
+commit 59089622dbb8dda783b1639c932123f125c3592d
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 4 14:54:32 2016 -0700
+
+    [coretext] Clarify comment
+
+ src/hb-coretext.cc | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+commit 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Mon Apr 4 14:34:25 2016 -0700
+
+    Fix FixedVersion::to_int()
+
+    Ouch.  Had broken it in 9a13ed453ef96822a47d6e6f58332b87f38d5c59
+
+    Fixes https://github.com/behdad/harfbuzz/issues/238
+    Will add test soon.
+
+ src/hb-open-type-private.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0251b0cc5c39272d2299d4b2ab802faaafe96837
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date:   Thu Mar 17 14:37:11 2016 -0700
+
+    1.2.4
+
+ NEWS         | 15 +++++++++++++++
+ configure.ac |  2 +-
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
 commit 69f9fbc4200442a35484d3c790ae8f4979be5d60
 Author: Behdad Esfahbod <behdad@behdad.org>
 Date:   Thu Mar 17 11:59:43 2016 -0700
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
index d2117493ed4..71036b3d76c 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.2.5
+Monday, April 4, 2016
+====================================
+
+- Fix GDEF mark-filtering-set, which was broken in 1.2.3.
+
+
 Overview of changes leading to 1.2.4
 Thursday, March 17, 2016
 ====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac
index 59603311349..e3eb2627d64 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.2.4],
+        [1.2.5],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
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 90c6653d00f..e64d2651a5e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc
@@ -904,13 +904,11 @@ resize_and_retry:
 	 * backend.
 	 *
 	 * However, even that wouldn't work if we were passed in the CGFont to
-	 * begin with.
-	 *
-	 * We might switch to checking PS name against "LastResort".  That would
-	 * be safe for all fonts except for those named "Last Resort".  Might be
-	 * better than what we have right now.
+	 * construct a hb_face to begin with.
 	 *
 	 * See: http://github.com/behdad/harfbuzz/pull/36
+	 *
+	 * Also see: https://bugs.chromium.org/p/chromium/issues/detail?id=597098
 	 */
 	bool matched = false;
 	for (unsigned int i = 0; i < range_records.len; i++)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh
index 0754ef0ef8e..80ad6877467 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh
@@ -751,7 +751,7 @@ struct CheckSum : ULONG
 template <typename FixedType=USHORT>
 struct FixedVersion
 {
-  inline uint32_t to_int (void) const { return (major << sizeof(FixedType)) + minor; }
+  inline uint32_t to_int (void) const { return (major << (sizeof(FixedType) * 8)) + minor; }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index 68827a46b5e..ec591229f95 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.2.4])
+m4_define([harfbuzz_version], [1.2.5])