update to build

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 5c27f856896d1287e844fd7dea204058bfb144dc..0c41108102565c8d3457b3c67fd33a02cd469b1f 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -124,6 +124,7 @@ Patch39:    libsecret.patch
 Patch40:       ffmpeg-generate-errors.patch
 Patch41:       ffmpeg-generate.patch
 Patch42:       system-ffmpeg.patch
+Patch43:       system-icu.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -337,6 +338,7 @@ ln -s %{SOURCE7} .
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p0
 
 # https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/9JX1N2nf4PU
 install -d chrome/test/data/webui

diff --git a/clean-source.sh b/clean-source.sh
index c85033c3623dd23e8b3cb23b28cc16e40db0bf57..73cffeae137f2a27f0111f7add890cc4b29322bb 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -506,6 +506,7 @@ remove_nonessential_dirs() {
                '!' -path 'native_client/src/include/win/mman.h' \
                '!' -path 'native_client/src/trusted/service_runtime/win/debug_exception_handler.h' \
                '!' -path 'native_client/src/trusted/service_runtime/win/exception_patch/ntdll_patch.h' \
+               '!' -path 'net/tools/dafsa/*' \
                '!' -path 'net/tools/tld_cleanup/*' \
                '!' -path 'remoting/tools/build/*' \
                '!' -path 'remoting/tools/verify_resources.py' \
@@ -1098,6 +1099,9 @@ remove_bundled_libraries() {
                'third_party/catapult/tracing/third_party/tvcm' \
                'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
                'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+               'third_party/catapult/third_party/py_vulcanize' \
+               'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+               'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
                'third_party/cld_2' \
                'third_party/cros_system_api' \
                'third_party/cython/python_flags.py' \

diff --git a/system-icu.patch b/system-icu.patch
new file mode 100644 (file)
index 0000000..e1e2135
--- /dev/null
+++ b/system-icu.patch
@@ -0,0 +1,11 @@
+--- components/autofill/core/common/autofill_l10n_util.cc.orig 2015-12-07 11:46:37.738740329 +0000
++++ components/autofill/core/common/autofill_l10n_util.cc      2015-12-07 11:46:44.574878953 +0000
+@@ -22,7 +22,7 @@
+     // library. This could be due to a device-specific issue (has been seen in
+     // the wild on Android devices). In the failure case, |collator_| will be
+     // null. See http://crbug.com/558625.
+-    icu_54::UnicodeString name;
++    icu::UnicodeString name;
+     std::string locale_name;
+     locale.getDisplayName(name).toUTF8String(locale_name);
+     LOG(ERROR) << "Failed to initialize the ICU Collator for "