From: Bowon Ryu Date: Tue, 25 Feb 2020 08:26:20 +0000 (+0900) Subject: Fixed broken patch X-Git-Tag: accepted/tizen/6.0/unified/20201030.105635^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fharfbuzz.git;a=commitdiff_plain;h=adc15de0bb68e623eb890cc54ae82a36fc5df466 Fixed broken patch (remove icu header dependencies from harfbuzz header) this patch is auto applied at build time. fixed not working properly after version up. Change-Id: Idb487f37946a5df09063ea391d3414842358dd58 Signed-off-by: Bowon Ryu --- diff --git a/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch b/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch index 9bec5d5..1f6335a 100644 --- a/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch +++ b/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch @@ -1,6 +1,6 @@ -From 6bce537e813081511d7899a235872ff794dbce1a Mon Sep 17 00:00:00 2001 -From: Jongmin Lee -Date: Wed, 4 Dec 2019 09:54:01 +0900 +From d90ac5141407d6c3278bb67784ea8cec1743ff89 Mon Sep 17 00:00:00 2001 +From: Bowon Ryu +Date: Tue, 25 Feb 2020 17:22:46 +0900 Subject: [PATCH] remove icu header dependencies from harfbuzz header Harfbuzz header include icu header that is not Tizen public API. @@ -9,26 +9,27 @@ should be removed. @tizen_fix -Change-Id: Ic73ee83de294c09fe3bf047eb3ed7f7c85bdc8c3 +Change-Id: Iecf2c69345cdb795c63be238895796e1d4adc610 +Signed-off-by: Bowon Ryu --- src/hb-icu.cc | 17 ++++++++++------- src/hb-icu.h | 5 ++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/hb-icu.cc b/src/hb-icu.cc -index c26c91d..7e89f78 100644 +index 985ff02..4767722 100644 --- a/src/hb-icu.cc +++ b/src/hb-icu.cc -@@ -38,6 +38,7 @@ +@@ -40,6 +40,7 @@ #include #include #include +#include - - /** -@@ -51,26 +52,28 @@ - + /* ICU extra semicolon, fixed since 65, https://github.com/unicode-org/icu/commit/480bec3 */ + #if U_ICU_VERSION_MAJOR_NUM < 65 && (defined(__GNUC__) || defined(__clang__)) +@@ -58,26 +59,28 @@ + **/ hb_script_t -hb_icu_script_to_script (UScriptCode script) @@ -62,7 +63,7 @@ index c26c91d..7e89f78 100644 } -@@ -153,7 +156,7 @@ hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, +@@ -160,7 +163,7 @@ hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, if (unlikely (U_FAILURE (status))) return HB_SCRIPT_UNKNOWN;