ICU upgrade to 54.1 step 2

patches/data.build.patch

Index: patches/data.build.patch
diff --git a/patches/data.build.patch b/patches/data.build.patch
index 4b235e4b7de0f1d5e0a3b722ae400a40311c1e12..cb4abebdc5c11c670a482d7a5bd7881f7a2e3634 100644
--- a/patches/data.build.patch
+++ b/patches/data.build.patch
@@ -1,48 +1,48 @@
-Index: source/data/Makefile.in
-===================================================================
---- source/data/Makefile.in	(revision 259715)
-+++ source/data/Makefile.in	(working copy)
-@@ -240,7 +240,14 @@
+diff --git a/source/data/Makefile.in b/source/data/Makefile.in
+index b1b3b36..380cc1a 100644
+--- a/source/data/Makefile.in
++++ b/source/data/Makefile.in
+@@ -246,7 +246,8 @@ package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
  #  2010-dec Removed pnames.icu.
  # These are now hardcoded in ICU4C and only loaded in ICU4J.
  #
--DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu nfc.nrm nfkc.nrm nfkc_cf.nrm uts46.nrm
-+# CHROME: unames.icu is excluded from the data file.
-+# coll/invuca.icu is also excluded. When building a ICU data file to check in,
-+# we need to copy data/in/coll/invuca.icu to the build location (expected
-+# by genrb : out/build/icudt46l/coll) by hand because genrb requires its
-+# presence when compiling coll/root.txt. We have to put it back if Webkit
-+# begins to use it.
-+# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 about invuca.icu.
-+DAT_FILES_SHORT=cnvalias.icu coll/ucadata.icu nfc.nrm nfkc.nrm nfkc_cf.nrm uts46.nrm
+-DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm
++# Chromium: Drop unames.icu because we don't need Unicode character names.
++DAT_FILES_SHORT=cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm
  DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
  
  ## BRK files
-@@ -271,7 +278,8 @@
+@@ -277,7 +278,8 @@ CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT)
  -include $(UCMSRCDIR)/ucmfiles.mk
  -include $(UCMSRCDIR)/ucmebcdic.mk
  -include $(UCMSRCDIR)/ucmlocal.mk
 -ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
-+# CHROME: we don't need any EBCDIC converters.
++# Chromium: Drop 2 ibm encodings not necessary.
 +ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
  UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
  CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
  CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
-@@ -338,7 +346,8 @@
- TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%)
- INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%)  $(TRANSLIT_SOURCE_LOCAL:%.txt=%)
- endif
--GENRBOPTS=-k
-+# CHROME : To save space, use '-R' option.
-+GENRBOPTS=-k -R
+@@ -529,7 +531,14 @@ $(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu
+ $(BUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm
+ 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
  
- ## MISC files
- -include $(MISCSRCDIR)/miscfiles.mk
-Index: source/tools/toolutil/pkg_genc.c
-===================================================================
---- source/tools/toolutil/pkg_genc.c	(revision 259715)
-+++ source/tools/toolutil/pkg_genc.c	(working copy)
-@@ -119,7 +119,11 @@
+-$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu
++# Chromium: To cut down the data size by 280kB,
++# use the code point order for CJK Ideographs in non-CJK locales instead
++# of the UniHan radical-stroke order. The latter is better, but non-CJK
++# locales do not have a great need for sorting CJK Ideographs.
++# Moreover, the most common subset (the original CJK Ideograph block) will
++# still be sorted correctly because the code point order is radical-stroke
++# order.
++$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-implicithan.icu
+ 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
+ 
+ ####################################################    SPP
+diff --git a/source/tools/toolutil/pkg_genc.c b/source/tools/toolutil/pkg_genc.c
+index e211403..ddc6941 100644
+--- a/source/tools/toolutil/pkg_genc.c
++++ b/source/tools/toolutil/pkg_genc.c
+@@ -119,7 +119,11 @@ static const struct AssemblyType {
          ".globl %s\n"
          "\t.section .note.GNU-stack,\"\",%%progbits\n"
          "\t.section .rodata\n"
@@ -55,7 +55,7 @@ Index: source/tools/toolutil/pkg_genc.c
          "\t.type %s,%%object\n"
          "%s:\n\n",
  
-@@ -129,6 +133,10 @@
+@@ -129,6 +133,10 @@ static const struct AssemblyType {
          /*"\t.section __TEXT,__text,regular,pure_instructions\n"
          "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n"*/
          ".globl _%s\n"
@@ -66,7 +66,7 @@ Index: source/tools/toolutil/pkg_genc.c
          "\t.data\n"
          "\t.const\n"
          "\t.balign 16\n"
-@@ -264,7 +272,7 @@
+@@ -264,7 +272,7 @@ writeAssemblyCode(const char *filename, const char *destdir, const char *optEntr
          exit(U_FILE_ACCESS_ERROR);
      }