summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog45
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/NEWS6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/RELEASING.md3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/configure.ac2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery-private.hh12
5 files changed, 65 insertions, 3 deletions
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 <behdad@behdad.org>
+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 <behdad@behdad.org>
+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 <behdad@behdad.org>
+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 <behdad@behdad.org>
+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 <behdad@behdad.org>
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<Stored **>(&this->instance), p, instance_)))
+ goto retry;
+ thiz ()->destroy (p);
+ }
}
inline const Returned * get (void) const