diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-07-19 19:28:55 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-31 18:20:05 +0200 |
| commit | 1be2c6215a006fa58113ee7789c86224978fac15 (patch) | |
| tree | 975887972bf3d386b6a6967e1086a80b2e00f09a /external | |
| parent | 9f800d2caf934c58b5845f6e235468ddfc80604f (diff) | |
upgrade the internal harfbuzz to 1.8.4
Change-Id: I127cf3fa3ae00e91c73114e1a1915ea614924819
Reviewed-on: https://gerrit.libreoffice.org/57771
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit b96bbb1ff391036cbba832bc22100792880f0fe6)
Reviewed-on: https://gerrit.libreoffice.org/58329
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 2 | ||||
| -rw-r--r-- | external/harfbuzz/clang-cl.patch | 6 | ||||
| -rw-r--r-- | external/harfbuzz/ubsan.patch | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index adc3e4c1bf59..55caa5ae0f6c 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(if $(ENABLE_OPTIMIZED), \ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(debug),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)) \ - $(CXXFLAGS) \ + $(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(ICU_UCHAR_TYPE) \ $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ diff --git a/external/harfbuzz/clang-cl.patch b/external/harfbuzz/clang-cl.patch index 5ba470637601..9fbeee4114d8 100644 --- a/external/harfbuzz/clang-cl.patch +++ b/external/harfbuzz/clang-cl.patch @@ -1,12 +1,12 @@ --- src/hb-common.h +++ src/hb-common.h -@@ -331,7 +331,9 @@ +@@ -346,7 +346,9 @@ * - * http://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html + * https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html */ +#if !defined _MSC_VER /* avoid clang-cl -Wmicrosoft-enum-value */ _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX, /*< skip >*/ +#endif _HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/ - + } hb_script_t; diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch index c2247ef84d3e..fb299316af9d 100644 --- a/external/harfbuzz/ubsan.patch +++ b/external/harfbuzz/ubsan.patch @@ -1,11 +1,11 @@ --- src/hb-ot-hmtx-table.hh +++ src/hb-ot-hmtx-table.hh -@@ -143,7 +143,7 @@ - return default_advance; +@@ -263,7 +263,7 @@ struct hmtxvmtx + return default_advance; } -- return table->longMetric[MIN (glyph, (uint32_t) num_advances - 1)].advance -+ return static_cast<OT::LongMetric const *>(table->longMetric)[MIN (glyph, (uint32_t) num_advances - 1)].advance - + var_table->get_advance_var (glyph, font->coords, font->num_coords); // TODO Optimize?! +- return table->longMetric[MIN (glyph, (uint32_t) num_advances - 1)].advance; ++ return static_cast<OT::LongMetric const *>(table->longMetric)[MIN (glyph, (uint32_t) num_advances - 1)].advance; } + inline unsigned int get_advance (hb_codepoint_t glyph, |