Fixed broken patch

[platform/upstream/harfbuzz.git] / patch / remove-icu-header-dependencies-from-harfbuzz-header.patch

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 (file)
--- 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 <jm105.lee@samsung.com>
-Date: Wed, 4 Dec 2019 09:54:01 +0900
+From d90ac5141407d6c3278bb67784ea8cec1743ff89 Mon Sep 17 00:00:00 2001
+From: Bowon Ryu <bowon.ryu@samsung.com>
+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 <bowon.ryu@samsung.com>
 ---
  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 <unicode/ustring.h>
  #include <unicode/utf16.h>
  #include <unicode/uversion.h>
 +#include <unicode/uscript.h>
  
- 
- /**
-@@ -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;