download.lst | 4 +--
external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1
external/harfbuzz/ubsan.patch | 32 --------------------------
3 files changed, 2 insertions(+), 35 deletions(-)
New commits:
commit 945c10f42fe6d22031e7424b47481ac2cfb539be
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 8 19:54:16 2017 +0100
upload harfbuzz 1.6.3
Change-Id: Ib9920366ba32774d1e96f9dfde201975c322e6f5
Reviewed-on: https://gerrit.libreoffice.org/44540
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index 2ca97abe6764..021ad87c0ada 100644
--- a/download.lst
+++ b/download.lst
@@ -82,8 +82,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 :=
ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
-export HARFBUZZ_TARBALL := harfbuzz-1.4.8.tar.bz2
+export HARFBUZZ_SHA256SUM :=
e31eb367beb61a9399d2c78b51c225ab2b1cbd46f364f2d80d97bb422b44101a
+export HARFBUZZ_TARBALL := harfbuzz-1.6.3.tar.bz2
export HSQLDB_SHA256SUM :=
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_SHA256SUM :=
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 74c990c0c1aa..8ec1c8d3ab23 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/clang-cl.patch \
- external/harfbuzz/ubsan.patch \
))
ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
deleted file mode 100644
index b855d5f2140d..000000000000
--- a/external/harfbuzz/ubsan.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/hb-ot-font.cc
-+++ src/hb-ot-font.cc
-@@ -138,7 +138,7 @@
- return this->default_advance;
- }
-
-- return this->table->longMetric[MIN (glyph, (uint32_t) this->num_advances
- 1)].advance
-+ return static_cast<OT::LongMetric const *>(this->table->longMetric)[MIN
(glyph, (uint32_t) this->num_advances - 1)].advance
- + this->var->get_advance_var (glyph, font->coords, font->num_coords);
// TODO Optimize?!
- }
- };
-@@ -458,8 +458,9 @@
- }
-
- static void
--_hb_ot_font_destroy (hb_ot_font_t *ot_font)
-+_hb_ot_font_destroy (void *ot_font_)
- {
-+ hb_ot_font_t *ot_font = static_cast<hb_ot_font_t *>(ot_font_);
- ot_font->cmap.fini ();
- ot_font->h_metrics.fini ();
- ot_font->v_metrics.fini ();
---- src/hb-private.hh
-+++ src/hb-private.hh
-@@ -461,6 +461,7 @@
- template <typename T>
- inline const Type *bsearch (T *key) const
- {
-+ if (len == 0) return NULL;
- return (const Type *) ::bsearch (key, array, len, sizeof (Type),
(hb_compare_func_t) Type::cmp);
- }
-
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
