diff options
Diffstat (limited to 'external/harfbuzz')
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 3 | ||||
| -rw-r--r-- | external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index eea793322965..adec72ed0d57 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -15,8 +15,11 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz)) $(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 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/ubsan.patch \ + external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 b/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 new file mode 100644 index 000000000000..55344bc632ba --- /dev/null +++ b/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 @@ -0,0 +1,12 @@ +diff -ur harfbuzz.org/src/hb-icu.cc harfbuzz/src/hb-icu.cc +--- harfbuzz.org/src/hb-icu.cc 2019-06-26 22:30:55.000000000 +0200 ++++ harfbuzz/src/hb-icu.cc 2019-10-28 23:21:42.198460246 +0100 +@@ -53,7 +53,7 @@ + + /* ICU doesn't do-while(0) around their statements. Ugh! + * https://unicode-org.atlassian.net/browse/CLDR-13027 */ +-#define HB_ICU_STMT(S) do { S } while (0) ++#define HB_ICU_STMT(S) do { S; } while (0) + + hb_script_t + hb_icu_script_to_script (UScriptCode script) |