Index: third_party/icu/patches/data.build.patch |
=================================================================== |
--- third_party/icu/patches/data.build.patch (revision 30645) |
+++ third_party/icu/patches/data.build.patch (working copy) |
@@ -1,16 +1,18 @@ |
--- source/data/Makefile.in 2009-05-20 23:03:54.000000000 -0700 |
-+++ source/data/Makefile.in 2009-10-21 15:43:18.235201000 -0700 |
-@@ -207,7 +207,8 @@ |
++++ source/data/Makefile.in 2009-11-18 11:03:35.699205000 -0800 |
+@@ -207,7 +207,10 @@ |
# 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu) |
# from data build. See Jitterbug 4497. (makedata.mak revision 1.117) |
# |
-DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu |
-+# CHROME: unames.icu are excluded from the icu data file |
-+DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu |
++# CHROME: unames.icu and invuca.icu are excluded from the data file |
++# We have to add invuca.icu back if Webkit begins to use it again |
++# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 |
++DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu |
DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) |
## BRK files |
-@@ -234,11 +235,12 @@ |
+@@ -234,11 +237,12 @@ |
CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT) |
## UCM files |
@@ -25,7 +27,7 @@ |
UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) |
CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) |
CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) |
-@@ -254,7 +256,7 @@ |
+@@ -254,7 +258,7 @@ |
-include $(RBNFSRCDIR)/rbnflocal.mk |
-include $(TRANSLITSRCDIR)/trnslocal.mk |
ifdef GENRB_SOURCE |
@@ -34,7 +36,7 @@ |
RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%) |
INSTALLED_RB_FILES = $(GENRB_SOURCE:%.txt=%) $(GENRB_SOURCE_LOCAL:%.txt=%) |
endif |
-@@ -273,7 +275,8 @@ |
+@@ -273,7 +277,8 @@ |
TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) |
INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL:%.txt=%) |
endif |
@@ -44,7 +46,7 @@ |
## MISC files |
-include $(MISCSRCDIR)/miscfiles.mk |
-@@ -423,7 +426,8 @@ |
+@@ -423,7 +428,8 @@ |
# ucadata.icu |
# used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu |
# see Jitterbug 4497 |
@@ -54,7 +56,7 @@ |
$(INVOKE) $(TOOLBINDIR)/genuca -s $(UNICODEDATADIR) -d $(COLBLDDIR) -i $(BUILDDIR) |
# unames.icu |
-@@ -437,7 +441,9 @@ |
+@@ -437,7 +443,9 @@ |
#################################################### SPP |
# SPP FILES |
@@ -64,21 +66,3 @@ |
+$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/pnames.icu |
$(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F) |
- #################################################### BRK |
-@@ -452,8 +458,9 @@ |
- #################################################### CTD |
- # CTD FILES |
- |
--$(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_FILES) |
-- $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(BUILDDIR) -o $@ $< |
-+# .ctd file now generated regardless of whether dictionary file exists |
-+$(BRKBLDDIR)/%.ctd: $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_FILES) |
-+ $(INVOKE) $(TOOLBINDIR)/genctd -c -i $(BUILDDIR) -o $@ $(BRKSRCDIR)/$(*F).txt |
- |
- #################################################### CFU |
- # CFU FILES |
-@@ -636,4 +643,3 @@ |
- $(RMV) $(LIBICUUC) |
- (cd ../common && $(MAKE) RECURSIVE=YES) || exit; |
- endif |
-- |