ICU update to 54.1 - step 5

android/brkitr.patch

Index: android/brkitr.patch
diff --git a/android/brkitr.patch b/android/brkitr.patch
index 0f4017e4748a0c0c28d0b59b7ca70abb80b5cbf4..9ffa7c0c916a825c04ff59f2f99d3c6c85a8a6aa 100644
--- a/android/brkitr.patch
+++ b/android/brkitr.patch
@@ -1,13 +1,8 @@
-Index: source/data/brkitr/word.txt
-===================================================================
---- source/data/brkitr/word.txt	(revision 264859)
-+++ source/data/brkitr/word.txt	(working copy)
-@@ -56,15 +56,13 @@
- #   5.0 or later as the definition of Complex_Context was corrected to include all
- #   characters requiring dictionary break.
- 
--$Control        = [\p{Grapheme_Cluster_Break = Control}]; 
-+$Control        = [\p{Grapheme_Cluster_Break = Control}];
+diff --git a/source/data/brkitr/word.txt b/source/data/brkitr/word.txt
+index c74da4c..c5d6df7 100644
+--- a/source/data/brkitr/word.txt
++++ b/source/data/brkitr/word.txt
+@@ -60,11 +60,9 @@ $Control        = [\p{Grapheme_Cluster_Break = Control}];
  $HangulSyllable = [\uac00-\ud7a3];
  $ComplexContext = [:LineBreak = Complex_Context:];
  $KanaKanji      = [$Han $Hiragana $Katakana];
@@ -21,7 +16,7 @@ Index: source/data/brkitr/word.txt
  
  
  #
-@@ -166,11 +164,6 @@
+@@ -166,11 +164,6 @@ $ExtendNumLetEx  $KatakanaEx     {400};    #  (13b)
  
  $Regional_IndicatorEx $Regional_IndicatorEx;
  
@@ -33,7 +28,7 @@ Index: source/data/brkitr/word.txt
  ## -------------------------------------------------
  
  !!reverse;
-@@ -237,10 +230,6 @@
+@@ -237,10 +230,6 @@ $BackExtendNumLetEx ($BackALetterEx | $BackHebrew_LetterEx | $BackNumericEx | $B
  
  $BackRegional_IndicatorEx $BackRegional_IndicatorEx;
  
@@ -44,32 +39,36 @@ Index: source/data/brkitr/word.txt
  ## -------------------------------------------------
  
  !!safe_reverse;
-Index: source/data/brkitr/brklocal.mk
-===================================================================
---- source/data/brkitr/brklocal.mk	(revision 264859)
-+++ source/data/brkitr/brklocal.mk	(working copy)
-@@ -34,13 +34,13 @@
+diff --git a/source/data/brkitr/brklocal.mk b/source/data/brkitr/brklocal.mk
+index ad36492..1d69c1e 100644
+--- a/source/data/brkitr/brklocal.mk
++++ b/source/data/brkitr/brklocal.mk
+@@ -34,17 +34,17 @@ BRK_RES_ALIAS_SOURCE = $(BRK_RES_SYNTHETIC_ALIAS)
  
  
  # List of dictionary files (dict).
--BRK_DICT_SOURCE = cjdict.txt khmerdict.txt laodict.txt thaidict.txt
-+BRK_DICT_SOURCE = khmerdict.txt laodict.txt thaidict.txt
+-BRK_DICT_SOURCE = burmesedict.txt cjdict.txt khmerdict.txt laodict.txt\
++BRK_DICT_SOURCE = burmesedict.txt khmerdict.txt laodict.txt\
+  thaidict.txt
  
  
  # List of break iterator files (brk).
--BRK_SOURCE = char.txt line.txt line_fi.txt sent.txt sent_el.txt title.txt word.txt
-+BRK_SOURCE = char.txt line.txt line_fi.txt sent.txt sent_el.txt title.txt word.txt word_ja.txt
+ BRK_SOURCE = char.txt line.txt line_fi.txt\
+- sent.txt sent_el.txt title.txt word.txt
++ sent.txt sent_el.txt title.txt word.txt word_ja.txt
  
  
  # Ordinary resources
--BRK_RES_SOURCE = el.txt en.txt en_US.txt fi.txt
-+BRK_RES_SOURCE = el.txt en.txt en_US.txt fi.txt ja.txt
- 
-Index: source/data/brkitr/root.txt
-===================================================================
---- source/data/brkitr/root.txt	(revision 264859)
-+++ source/data/brkitr/root.txt	(working copy)
-@@ -16,9 +16,6 @@
+ BRK_RES_SOURCE = de.txt el.txt en.txt en_US.txt\
+  en_US_POSIX.txt es.txt fi.txt fr.txt it.txt\
+- pt.txt ru.txt
++ pt.txt ru.txt ja.txt
+ 
+diff --git a/source/data/brkitr/root.txt b/source/data/brkitr/root.txt
+index 2dd1fdc..1d066be 100644
+--- a/source/data/brkitr/root.txt
++++ b/source/data/brkitr/root.txt
+@@ -16,9 +16,6 @@ root{
          word:process(dependency){"word.brk"}
      }
      dictionaries{
@@ -78,14 +77,14 @@ Index: source/data/brkitr/root.txt
 -        Kata:process(dependency){"cjdict.dict"}
          Khmr:process(dependency){"khmerdict.dict"}
          Laoo:process(dependency){"laodict.dict"}
-         Thai:process(dependency){"thaidict.dict"}
-Index: source/data/brkitr/ja.txt
-===================================================================
---- source/data/brkitr/ja.txt	(revision 264859)
-+++ source/data/brkitr/ja.txt	(working copy)
+         Mymr:process(dependency){"burmesedict.dict"}
+diff --git a/source/data/brkitr/ja.txt b/source/data/brkitr/ja.txt
+index 3eb81d0..ffdbc6d 100644
+--- a/source/data/brkitr/ja.txt
++++ b/source/data/brkitr/ja.txt
 @@ -9,6 +9,6 @@
  ja{
-     Version{"1.1"}
+     Version{"2.0.82.42"}
      boundaries{
 -        line:process(dependency){"line_ja.brk"}
 +        word:process(dependency){"word_ja.brk"}