up to 50.0.2661.66

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 007cff321f32e42c858fb04b0495a62ed663675a..b8aed15a42bdacbf7d3fe51d8450e98d4338ba65 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -18,7 +18,8 @@
 %bcond_without system_flac             # system flac
 %bcond_without system_ffmpeg   # system ffmpeg
 %bcond_without system_harfbuzz # system harfbuzz
-%bcond_without system_icu      # system icu
+# http://bugs.gentoo.org/576370
+%bcond_with    system_icu      # system icu
 %bcond_without system_jsoncpp  # system jsoncpp
 %bcond_without system_libexif  # system libexif
 %bcond_without system_libmtp   # system libmtp
@@ -72,9 +73,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          49.0.2623
-%define                basever         87
-%define                patchver        112
+%define                branch          50.0.2661
+%define                basever         66
+%define                patchver        %{nil}
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
@@ -86,9 +87,9 @@ Version:      %{branch}.%{basever}
 Release:       1
 License:       BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:         X11/Applications/Networking
-Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: 75f28841d204632fb6de5375af28535a
-#Source0:      http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+#Source0:      http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5: edc30e60991b597a20786998a5d6c298
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  798db2b4d368f2ac1e5d50747964fc7f

diff --git a/clean-source.sh b/clean-source.sh
index 29534ede81ff9c92cabcad8edd9f708533f86189..c1de9ca0541a2633817a4c4320cfafdb7514dc36 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -547,6 +547,7 @@ almost_strip_dirs() {
        find tools -type f \
                '!' -iname '*.gyp*' \
                '!' -path 'tools/build/*' \
+               '!' -path 'tools/battor_agent/*' \
                '!' -path 'tools/clang/scripts/plugin_flags.sh' \
                '!' -path 'tools/compile_test/compile_test.py' \
                '!' -path 'tools/generate_library_loader/*' \
@@ -640,6 +641,7 @@ clean_third_party() {
                '!' -path 'third_party/libjingle/*' \
                '!' -path 'third_party/libphonenumber/*' \
                '!' -path 'third_party/libsecret/*' \
+               '!' -path 'third_party/libsrtp/*' \
                '!' -path 'third_party/libusb/*' \
                '!' -path 'third_party/libva/*' \
                '!' -path 'third_party/libvpx_new/*' \
@@ -1072,6 +1074,7 @@ remove_bundled_libraries() {
                third_party/markupsafe/ \
                third_party/ply/ \
                third_party/catapult/third_party/beautifulsoup4 \
+               third_party/icu \
                'base/third_party/dmg_fp' \
                'base/third_party/dynamic_annotations' \
                'base/third_party/icu' \
@@ -1141,9 +1144,9 @@ remove_bundled_libraries() {
                'third_party/lzma_sdk' \
                'third_party/mesa' \
                'third_party/modp_b64' \
-               'third_party/mojo' \
                'third_party/mt19937ar' \
                'third_party/npapi' \
+               'third_party/openh264' \
                'third_party/openmax_dl' \
                'third_party/opus' \
                'third_party/ots' \
@@ -1207,7 +1210,7 @@ strip_system_dirs \
        third_party/libjpeg \
        third_party/libmtp \
        third_party/libpng \
-       third_party/libsrtp \
+       third_party/libsrtp_ \
        third_party/libusb_ \
        third_party/libvpx_ \
        third_party/libwebp \

diff --git a/system-jinja.patch b/system-jinja.patch
index fe28e12c333c3ab995bde4d6dea27e6f6a555829..e1576ae77d6a8990ef477b1f32511f75f5f80c3c 100644 (file)
--- a/system-jinja.patch
+++ b/system-jinja.patch
@@ -33,3 +33,15 @@
        # Web IDL lexer/parser (base parser)
        '<(DEPTH)/tools/idl_parser/idl_lexer.py',
        '<(DEPTH)/tools/idl_parser/idl_node.py',
+--- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig    2016-03-23 15:10:41.522637837 +0000
++++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000
+@@ -6,9 +6,6 @@
+   'variables': {
+     'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
+     'jinja_module_files': [
+-      # jinja2/__init__.py contains version string, so sufficient for package
+-      '<(DEPTH)/third_party/jinja2/__init__.py',
+-      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+     ],
+   },
+