update files

diff --git a/chromium-browser.spec b/chromium-browser.spec
index b59f9f33dae196d07c7614fb00d0db7342c68562..5497a82b8738c5a920946f0091103d37ba91fec5 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -18,7 +18,7 @@
 %bcond_without system_flac             # system flac
 %bcond_with    system_ffmpeg   # system ffmpeg instead of ffmpegsumo
 %bcond_without system_harfbuzz # system harfbuzz
-%bcond_without system_icu      # system icu
+%bcond_with    system_icu      # system icu, disabled: http://bugs.icu-project.org/trac/ticket/11358)
 %bcond_without system_jsoncpp  # system jsoncpp
 %bcond_without system_libexif  # system libexif
 %bcond_without system_libmtp   # system libmtp
@@ -122,7 +122,6 @@ Patch36:    angle.patch
 Patch37:       %{name}-build.patch
 Patch38:       vaapi_include.patch
 Patch39:       libsecret.patch
-Patch40:       system-libvpx.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -332,7 +331,6 @@ ln -s %{SOURCE7} .
 %patch37 -p1
 #%patch38 -p1 CHECK
 %patch39 -p1
-%patch40 -p0
 
 %{?with_dev:exit 0}
 

diff --git a/clean-source.sh b/clean-source.sh
index 8fd460913a60bcec4b3c1ea8bacc89e8fd93f3a8..cb9f8613cc09f6adf64e43c81875e660b68c1823 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -620,6 +620,7 @@ clean_third_party() {
                '!' -path 'third_party/hunspell/*' \
                '!' -path 'third_party/hyphen/*' \
                '!' -path 'third_party/iccjpeg/*' \
+               '!' -path 'third_party/icu/*' \
                '!' -path 'third_party/icu/icu.isolate' \
                '!' -path 'third_party/jinja2/*' \
                '!' -path 'third_party/jstemplate/*' \
@@ -1025,6 +1026,8 @@ remove_tests() {
                '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_case.js' \
                '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_error.js' \
                '!' -path './third_party/trace-viewer/third_party/tvcm/src/tvcm/unittest/test_runner.js' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/third_party/rcssmin/*' \
+               '!' -path './third_party/trace-viewer/third_party/tvcm/third_party/rjsmin/*' \
                '!' -path './third_party/trace-viewer/trace_viewer/tracing/test_utils.js' \
                '!' -path './mojo/embedder/test_embedder.*' \
                '!' -path './ui/base/hit_test.*' \
@@ -1093,6 +1096,7 @@ remove_bundled_libraries() {
                'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
                'third_party/hunspell' \
                'third_party/iccjpeg' \
+               'third_party/icu' \
                'third_party/jstemplate' \
                'third_party/khronos' \
                'third_party/leveldatabase' \
@@ -1137,6 +1141,8 @@ remove_bundled_libraries() {
                'third_party/trace-viewer/third_party/jszip' \
                'third_party/trace-viewer/third_party/tvcm' \
                'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
+               'third_party/trace-viewer/third_party/tvcm/third_party/rcssmin' \
+               'third_party/trace-viewer/third_party/tvcm/third_party/rjsmin' \
                'third_party/undoview' \
                'third_party/usrsctp' \
                'third_party/web-animations-js' \

diff --git a/system-libvpx.patch b/system-libvpx.patch
deleted file mode 100644 (file)
index d9a3425..0000000
--- a/system-libvpx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/linux/unbundle/libvpx.gyp.orig       2015-04-08 09:25:29.605925761 +0000
-+++ build/linux/unbundle/libvpx.gyp    2015-04-08 09:27:19.932142216 +0000
-@@ -24,6 +24,7 @@
-           'vpx/vpx_integer.h',
-           'vpx/vp8dx.h',
-           'vpx/vpx_encoder.h',
-+          'vpx/vpx_frame_buffer.h',
-         ],
-       },
-       'includes': [