summaryrefslogtreecommitdiff
path: root/external/harfbuzz
diff options
context:
space:
mode:
authorKhaled Hosny <khaled@aliftype.com>2022-07-30 19:30:26 +0200
committerCaolán McNamara <caolanm@redhat.com>2022-07-31 23:23:30 +0200
commit4e72f70c796fee9b0af6a526159143b5e70dcd11 (patch)
treeab10a0a924b5dad0ece4163e31c3b1958c738ca8 /external/harfbuzz
parent64ac089ad5464c832592e050f5d51a136f533f21 (diff)
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>
Diffstat (limited to 'external/harfbuzz')
-rw-r--r--external/harfbuzz/UnpackedTarball_harfbuzz.mk7
-rw-r--r--external/harfbuzz/negativeadvance.patch11
2 files changed, 0 insertions, 18 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 83df909aaf99..a99f116d80ad 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 ab19aa2631e0..000000000000
--- 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