diff options
| author | Bowon Ryu <bowon.ryu@samsung.com> | 2020-12-24 14:27:44 +0900 |
|---|---|---|
| committer | Bowon Ryu <bowon.ryu@samsung.com> | 2020-12-24 14:27:44 +0900 |
| commit | e6340fb871e5c683d476319a9d572c470c0f3a79 (patch) | |
| tree | 500804af64d68f251d8a483a15a3ff9868f33007 | |
| parent | 1870b15ecd599cd8b65392fa5835eb77b645aaa9 (diff) | |
| download | harfbuzz-e6340fb871e5c683d476319a9d572c470c0f3a79.tar.gz harfbuzz-e6340fb871e5c683d476319a9d572c470c0f3a79.tar.bz2 harfbuzz-e6340fb871e5c683d476319a9d572c470c0f3a79.zip | |
Fixed broken patchtizen_6.5.m2_releasesubmit/tizen_6.5/20211028.163401submit/tizen/20210103.212140submit/tizen/20210103.044544accepted/tizen/unified/20210104.130314accepted/tizen/6.5/unified/20211029.013537
(remove icu header dependencies from harfbuzz header)
this patch is auto applied at build time.
fixed not working properly after version up.
Change-Id: I32362f64470bbd96aeb424f576a9d4a674e60d88
| -rw-r--r-- | patch/remove-icu-header-dependencies-from-harfbuzz-header.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch b/patch/remove-icu-header-dependencies-from-harfbuzz-header.patch index 1f6335a..8911866 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 d90ac5141407d6c3278bb67784ea8cec1743ff89 Mon Sep 17 00:00:00 2001 +From c7cac7e0d3bbba4285354c90590a6e6d081fce61 Mon Sep 17 00:00:00 2001 From: Bowon Ryu <bowon.ryu@samsung.com> -Date: Tue, 25 Feb 2020 17:22:46 +0900 +Date: Thu, 24 Dec 2020 13:35:34 +0900 Subject: [PATCH] remove icu header dependencies from harfbuzz header Harfbuzz header include icu header that is not Tizen public API. @@ -9,15 +9,15 @@ should be removed. @tizen_fix -Change-Id: Iecf2c69345cdb795c63be238895796e1d4adc610 +Change-Id: I94835684a7ddc193c42cc0e2565a200f13c62f8c Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com> --- src/hb-icu.cc | 17 ++++++++++------- - src/hb-icu.h | 5 ++--- - 2 files changed, 12 insertions(+), 10 deletions(-) + src/hb-icu.h | 6 ++---- + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/hb-icu.cc b/src/hb-icu.cc -index 985ff02..4767722 100644 +index c1dcc24..98de45f 100644 --- a/src/hb-icu.cc +++ b/src/hb-icu.cc @@ -40,6 +40,7 @@ @@ -28,7 +28,7 @@ index 985ff02..4767722 100644 /* 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 @@ +@@ -72,8 +73,10 @@ **/ hb_script_t @@ -40,9 +40,10 @@ index 985ff02..4767722 100644 if (unlikely (script == USCRIPT_INVALID_CODE)) return HB_SCRIPT_INVALID; - return hb_script_from_string (uscript_getShortName (script), -1); - } - +@@ -90,18 +93,18 @@ hb_icu_script_to_script (UScriptCode script) + * Return value: the UScriptCode identifier found + * + **/ -UScriptCode +unsigned int hb_icu_script_from_script (hb_script_t script) @@ -63,7 +64,7 @@ index 985ff02..4767722 100644 } -@@ -160,7 +163,7 @@ hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, +@@ -184,7 +187,7 @@ hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, if (unlikely (U_FAILURE (status))) return HB_SCRIPT_UNKNOWN; @@ -73,15 +74,15 @@ index 985ff02..4767722 100644 static hb_bool_t diff --git a/src/hb-icu.h b/src/hb-icu.h -index 2db6a7b..dc6d7aa 100644 +index 2db6a7b..47e718c 100644 --- a/src/hb-icu.h +++ b/src/hb-icu.h -@@ -31,15 +31,14 @@ +@@ -31,15 +31,13 @@ #include "hb.h" -#include <unicode/uscript.h> - +- HB_BEGIN_DECLS |