summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-06-28 10:01:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-06-28 11:57:36 +0200
commit76bf22074a9bb5d6ef177783e5baa41760aa27e9 (patch)
tree38c7fef4787797a65b621d26a75d323f1ecf7cc9 /external
parent3c7871626186c07dcd2ad874d70ea53aa8ae29aa (diff)
Mark external/harfbuzz/Wunused-but-set-variable.patch as fixed upstream
Change-Id: Iefc8f4f6ff93ec1a11256724b1881689d5eb56d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117992 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/harfbuzz/UnpackedTarball_harfbuzz.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 49119e30861b..cff8d91369e2 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,6 +17,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
# icu-65-api-macros-with-semicolon.patch.1
# See http://site.icu-project.org/download/65 Migration Issues
+# Wunused-but-set-variable.patch
+# Independently fixed upstream in a similar way with
+# <https://github.com/harfbuzz/harfbuzz/commit/d6a83abd6a0c684bd9a27f593d5be388819022b7> "Define
+# HB_UNUSED for clang"
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/ubsan.patch \
external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 \