Update HarfBuzz to 5.1.0
Dropping negativeadvance.patch that was applied upstream.
Change-Id: I8eba49d2d158c0c29911f4079315ed0bf87b7fa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137648
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/download.lst b/download.lst
index f0a7603..4182269 100644
--- a/download.lst
+++ b/download.lst
@@ -100,8 +100,8 @@ export GPGME_SHA256SUM := 6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405
export GPGME_TARBALL := gpgme-1.16.0.tar.bz2
export GRAPHITE_SHA256SUM := b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
export HARFBUZZ_SHA256SUM := a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530
export HARFBUZZ_TARBALL := harfbuzz-4.3.0.tar.xz
export HARFBUZZ_SHA256SUM := 2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05
export HARFBUZZ_TARBALL := harfbuzz-5.1.0.tar.xz
export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 83df909..a99f116 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,11 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
# * external/harfbuzz/negativeadvance.patch sent upstram as
# <https://github.com/harfbuzz/harfbuzz/pull/3128> "hb_graphite2_cluster_t::advance can apparently
# be negative":
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/negativeadvance.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/negativeadvance.patch b/external/harfbuzz/negativeadvance.patch
deleted file mode 100644
index ab19aa2..0000000
--- a/external/harfbuzz/negativeadvance.patch
+++ /dev/null
@@ -1,11 +0,0 @@
--- src/hb-graphite2.cc
+++ src/hb-graphite2.cc
@@ -223,7 +223,7 @@
unsigned int base_glyph;
unsigned int num_glyphs;
unsigned int cluster;
- unsigned int advance;
+ int advance;
};
hb_bool_t
