Bug 1075758 - Remove omitCollationRules patch, already performed upstream. r=glandium
authorJeff Walden <jwalden@mit.edu>
Fri, 12 Jun 2015 14:25:23 -0700
changeset 250761 2ce5c66c12839dc37aaa61013e2a43559c10cf37
parent 250760 e575191a567bdef4a4d12c5ccbb87a1ef838340b
child 250762 cbcc5ea79885e44d23d3053a29cdc8beb492a134
push id13792
push userkwierso@gmail.com
push dateWed, 01 Jul 2015 00:00:06 +0000
treeherderfx-team@ec66a98df9d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1075758
milestone42.0a1
Bug 1075758 - Remove omitCollationRules patch, already performed upstream. r=glandium
intl/icu-patches/genrb-omitCollationRules.diff
intl/update-icu.sh
deleted file mode 100644
--- a/intl/icu-patches/genrb-omitCollationRules.diff
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --git a/intl/icu/source/tools/genrb/genrb.c b/intl/icu/source/tools/genrb/genrb.c
---- a/intl/icu/source/tools/genrb/genrb.c
-+++ b/intl/icu/source/tools/genrb/genrb.c
-@@ -1,7 +1,7 @@
- /*
- *******************************************************************************
- *
--*   Copyright (C) 1998-2012, International Business Machines
-+*   Copyright (C) 1998-2014, International Business Machines
- *   Corporation and others.  All Rights Reserved.
- *
- *******************************************************************************
-@@ -280,7 +280,7 @@
-         }
-     }
- 
--    initParser(options[NO_COLLATION_RULES].doesOccur);
-+    initParser();
- 
-     /*added by Jing*/
-     if(options[LANGUAGE].doesOccur) {
-@@ -557,7 +557,8 @@
-         printf("autodetected encoding %s\n", cp);
-     }
-     /* Parse the data into an SRBRoot */
--    data = parse(ucbuf, inputDir, outputDir, !omitBinaryCollation, status);
-+    data = parse(ucbuf, inputDir, outputDir,
-+                 !omitBinaryCollation, options[NO_COLLATION_RULES].doesOccur, status);
- 
-     if (data == NULL || U_FAILURE(*status)) {
-         fprintf(stderr, "couldn't parse the file %s. Error:%s\n", filename,u_errorName(*status));
-diff --git a/intl/icu/source/tools/genrb/parse.cpp b/intl/icu/source/tools/genrb/parse.cpp
---- a/intl/icu/source/tools/genrb/parse.cpp
-+++ b/intl/icu/source/tools/genrb/parse.cpp
-@@ -85,10 +85,9 @@
-     const char     *outputdir;
-     uint32_t        outputdirLength;
-     UBool           makeBinaryCollation;
-+    UBool           omitCollationRules;
- } ParseState;
- 
--static UBool gOmitCollationRules  = FALSE;
--
- typedef struct SResource *
- ParseResourceFunction(ParseState* state, char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status);
- 
-@@ -323,7 +322,7 @@
-     }
-     uprv_strcat(filename, cs);
- 
--    if(gOmitCollationRules) {
-+    if(state->omitCollationRules) {
-         return res_none();
-     }
- 
-@@ -771,7 +770,7 @@
-     }
- 
-     /* Parse the data into an SRBRoot */
--    data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, status);
-+    data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, FALSE, status);
- 
-     root = data->fRoot;
-     collations = resLookup(root, "collations");
-@@ -1007,7 +1006,7 @@
- #endif
-             /* in order to achieve smaller data files, we can direct genrb */
-             /* to omit collation rules */
--            if(gOmitCollationRules) {
-+            if(state->omitCollationRules) {
-                 bundle_closeString(state->bundle, member);
-             } else {
-                 table_add(result, member, line, status);
-@@ -1839,7 +1838,7 @@
-     {"reserved", NULL, NULL}
- };
- 
--void initParser(UBool omitCollationRules)
-+void initParser()
- {
-     U_STRING_INIT(k_type_string,    "string",    6);
-     U_STRING_INIT(k_type_binary,    "binary",    6);
-@@ -1858,8 +1857,6 @@
-     U_STRING_INIT(k_type_plugin_collation,      "process(collation)",        18);
-     U_STRING_INIT(k_type_plugin_transliterator, "process(transliterator)",   23);
-     U_STRING_INIT(k_type_plugin_dependency,     "process(dependency)",       19);
--
--    gOmitCollationRules = omitCollationRules;
- }
- 
- static inline UBool isTable(enum EResourceType type) {
-@@ -2039,8 +2036,8 @@
- 
- /* parse the top-level resource */
- struct SRBRoot *
--parse(UCHARBUF *buf, const char *inputDir, const char *outputDir, UBool makeBinaryCollation,
--      UErrorCode *status)
-+parse(UCHARBUF *buf, const char *inputDir, const char *outputDir,
-+      UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status)
- {
-     struct UString    *tokenValue;
-     struct UString    comment;
-@@ -2064,6 +2061,7 @@
-     state.outputdir       = outputDir;
-     state.outputdirLength = (state.outputdir != NULL) ? (uint32_t)uprv_strlen(state.outputdir) : 0;
-     state.makeBinaryCollation = makeBinaryCollation;
-+    state.omitCollationRules = omitCollationRules;
- 
-     ustr_init(&comment);
-     expect(&state, TOK_STRING, &tokenValue, &comment, NULL, status);
-diff --git a/intl/icu/source/tools/genrb/parse.h b/intl/icu/source/tools/genrb/parse.h
---- a/intl/icu/source/tools/genrb/parse.h
-+++ b/intl/icu/source/tools/genrb/parse.h
-@@ -1,7 +1,7 @@
- /*
- *******************************************************************************
- *
--*   Copyright (C) 1998-2011, International Business Machines
-+*   Copyright (C) 1998-2014, International Business Machines
- *   Corporation and others.  All Rights Reserved.
- *
- *******************************************************************************
-@@ -24,11 +24,11 @@
- 
- U_CDECL_BEGIN
- /* One time parser initalisation */
--void initParser(UBool omitCollationRules);
-+void initParser();
- 
- /* Parse a ResourceBundle text file */
- struct SRBRoot* parse(UCHARBUF *buf, const char* inputDir, const char* outputDir,
--                      UBool omitBinaryCollation, UErrorCode *status);
-+                      UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status);
- 
- U_CDECL_END
- 
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -49,14 +49,13 @@ rm ${icu_dir}/source/data/translit/*
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
 
 exit 0
 
-patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/genrb-omitCollationRules.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/clang-cl.diff
 
 hg addremove ${icu_dir}