[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - download.lst external/harfbuzz

[Libreoffice Gerrit user]

 download.lst                                  |    4 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |    2 +-
 external/harfbuzz/clang-cl.patch              |    6 +++---
 external/harfbuzz/ubsan.patch                 |   10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1be2c6215a006fa58113ee7789c86224978fac15
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Jul 19 19:28:55 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 31 18:20:05 2018 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit b96bbb1ff391036cbba832bc22100792880f0fe6)
    Reviewed-on: https://gerrit.libreoffice.org/58329

diff --git a/download.lst b/download.lst
index a4cb2cd6b273..1f294d5d01c6 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,8 @@ export GPGME_SHA256SUM := 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
-export HARFBUZZ_SHA256SUM := b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b
-export HARFBUZZ_TARBALL := harfbuzz-1.7.4.tar.bz2
+export HARFBUZZ_SHA256SUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
+export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
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,