update clean source script

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 60da4b7c08fefba9160a7b2b5dc7d61730b6ecbf..3a384af65ebd14e48880a2a6b04d11df209d8b9f 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -75,7 +75,7 @@ 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: bd73f999cd1716deafd19c41b13c318c
+# Source0-md5: a9b5e04e9a5d45154de1f5dfeb5bf98c
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  194579901c234fbce9e1538e7956d36c

diff --git a/clean-source.sh b/clean-source.sh
index ec2968965a112168def8fd81417fda6a2eda7c21..2e6055a77b0a673b2cc0098639d2e6d92635fac1 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -41,7 +41,7 @@ remove_nonessential_dirs() {
        for dir in \
        v8/benchmarks \
        v8/src/arm \
-       v8/src/d8* \
+       v8/src/d8__* \
        third_party/chromite \
        android_webview \
        ash/resources/default_100_percent/cros_ \
@@ -462,10 +462,10 @@ remove_nonessential_dirs() {
        ) '!' -type d '(' \
                '!' -name '*.grd' \
                '!' -name '*.gyp*' \
+               '!' -name '*.isolate' \
                '!' -path 'base/mac/bundle_locations.h' \
                '!' -path 'base/mac/crash_logging.h' \
                '!' -path 'base/win/windows_version.h' \
-               '!' -path 'build/android/cpufeatures.gypi' \
                '!' -path 'chrome/browser/chromeos/attestation/platform_verification_flow.h' \
                '!' -path 'chrome/browser/chromeos/contacts/contact.proto' \
                '!' -path 'chrome/browser/chromeos/extensions/*.h' \
@@ -587,13 +587,18 @@ clean_third_party() {
 
        find third_party -type f \
                '!' -iname '*.gyp*' \
+               '!' -iname '*.isolate' \
                '!' -path 'third_party/WebKit/*' \
+               '!' -path 'third_party/libwebm/*' \
                '!' -path 'third_party/adobe/flash/*' \
                '!' -path 'third_party/angle/include/EGL/*' \
                '!' -path 'third_party/angle/include/GLSLANG/*' \
                '!' -path 'third_party/angle/src/common/*' \
                '!' -path 'third_party/angle/src/compiler/*' \
+               '!' -path 'third_party/angle/src/enumerate_files.py' \
                '!' -path 'third_party/angle/src/third_party/compiler/*' \
+               '!' -path 'third_party/angle/src/*' \
+               '!' -path 'third_party/brotli/*' \
                '!' -path 'third_party/cacheinvalidation/*' \
                '!' -path 'third_party/cld/*' \
                '!' -path 'third_party/cld_2/*' \
@@ -603,6 +608,8 @@ clean_third_party() {
                '!' -path 'third_party/hunspell/*' \
                '!' -path 'third_party/hyphen/*' \
                '!' -path 'third_party/iccjpeg/*' \
+               '!' -path 'third_party/icu/*' \
+               '!' -path 'third_party/jinja2/*' \
                '!' -path 'third_party/jstemplate/*' \
                '!' -path 'third_party/khronos/*' \
                '!' -path 'third_party/leveldatabase/*' \
@@ -618,6 +625,7 @@ clean_third_party() {
                '!' -path 'third_party/libyuv/*' \
                '!' -path 'third_party/lss/*.h' \
                '!' -path 'third_party/lzma_sdk/*' \
+               '!' -path 'third_party/markupsafe/*' \
                '!' -path 'third_party/mesa/src/include/GL/gl.h' \
                '!' -path 'third_party/mesa/src/include/GL/glext.h' \
                '!' -path 'third_party/mesa/src/include/GL/glx.h' \
@@ -627,6 +635,7 @@ clean_third_party() {
                '!' -path 'third_party/mt19937ar/*' \
                '!' -path 'third_party/npapi/*' \
                '!' -path 'third_party/ots/*' \
+               '!' -path 'third_party/polymer/*' \
                '!' -path 'third_party/protobuf/*' \
                '!' -path 'third_party/qcms/*' \
                '!' -path 'third_party/re2/*' \
@@ -685,7 +694,7 @@ strip_system_dirs() {
                # skip already removed dirs
                test -d $dir || continue
 
-               find $dir -depth -mindepth 1 '!' '(' -name '*.gyp' -o -name '*.gypi' -o -path $dir/$lib.h $args ')' -print -delete || :
+               find $dir -depth -mindepth 1 '!' '(' -name '*.gyp' -o -name '*.gypi' -o -name '*.isolate' -o -path $dir/$lib.h $args ')' -print -delete || :
        done
        set +f
 }
@@ -696,7 +705,7 @@ strip_system_dirs() {
 remove_tests() {
        local dir
 
-       # full remove
+       echo '> full remove'
        for dir in \
        ash/test \
        base/test_ \
@@ -728,7 +737,7 @@ remove_tests() {
        chrome_frame/tools/test \
        content/browser/worker_host/test \
        content/common/gpu/testdata \
-       content/public/test \
+       content/public/test_ \
        content/test \
        courgette/testdata \
        device/bluetooth/test \
@@ -892,7 +901,7 @@ remove_tests() {
                rm -vfr "$dir"
        done
 
-       # partial remove (keep .gyp)
+       echo '> partial remove (keep .gyp)'
        for dir in \
                chrome/browser/nacl_host/test \
                chrome/test/data \
@@ -929,17 +938,18 @@ remove_tests() {
 #      install -d testing/gtest/include
 #      ln -s /usr/include/gtest testing/gtest/include/gtest
 
-       # delete unittest files
+       echo '> delete unittest files'
        find . '(' \
-               -name '*_unittest*.*' \
-               -o -name '*_unittest.*' \
-               -o -name '*_unittest' \
-               -o -name 'test_*.*' \
-               -o -name '*_test.*' \
-               -o -path './testing/' \
-       ')' '!' -name '*.gyp*' \
-               '!' -name '*.isolate' \
+               -name '*_unittest*.*' -o \
+               -name '*_unittest.*' -o \
+               -name '*_unittest' -o \
+               -name 'test_*.*' -o \
+               -name '*_test.*' -o \
+               -path './testing/' \
+       ')' '!' -type d '(' \
                '!' -name '*.grd' \
+               '!' -name '*.gyp*' \
+               '!' -name '*.isolate' \
                '!' -path './base/test/*' \
                '!' -path './base/test/launcher/*' \
                '!' -path './base/test/launcher/test_launcher.*' \
@@ -959,6 +969,7 @@ remove_tests() {
                '!' -path './chrome/test/base/test_switches.*' \
                '!' -path './chrome/test/perf/browser_perf_test.*' \
                '!' -path './chrome/test/perf/perf_test.*' \
+               '!' -path './content/public/test/test_utils.h' \
                '!' -path './media/cast/rtcp/test_rtcp_packet_builder.*' \
                '!' -path './native_client/src/trusted/fault_injection/test_injection.*' \
                '!' -path './native_client/src/trusted/service_runtime/env_cleanser_test.h' \
@@ -971,6 +982,11 @@ remove_tests() {
                '!' -path './third_party/skia/src/gpu/gr_unittests.*' \
                '!' -path './third_party/trace-viewer/src/base/unittest/test_error.js' \
                '!' -path './third_party/trace-viewer/src/tracing/test_utils.js' \
+               '!' -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/src/tvcm/unittest/*.js' \
+               '!' -path './tools/compile_test/compile_test.py' \
                '!' -path './tools/compile_test/compile_test.py' \
                '!' -path './ui/compositor/test_web_graphics_context_3d.*' \
                '!' -path './ui/webui/resources/js/webui_resource_test.js' \
@@ -980,15 +996,21 @@ remove_tests() {
                '!' -path './webkit/gpu/test_context_provider_factory.*' \
                '!' -path './webkit/support/test_webkit_platform_support.h' \
                '!' -path './webkit/tools/test_shell/*.h' \
-       -print -delete || :
+       ')' \
+               -print -delete || :
 }
 
 # Remove most bundled libraries. Some are still needed.
 # Sync this with gentoo/chromium-*.ebuild
 # NOTE: argument list to script specifies paths to preserve
 remove_bundled_libraries() {
+       # ninja: error: '../../third_party/jinja2/__init__.py', needed by 'gen/blink/InternalSettingsGenerated.idl', missing and no known rule to make it
+       # ninja: error: '../../third_party/markupsafe/__init__.py', needed by 'gen/blink/InternalSettingsGenerated.idl', missing and no known rule to make it
+
        build/linux/unbundle/remove_bundled_libraries.py \
                third_party/adobe/flash/flapper_version.h \
+               third_party/jinja2 \
+               third_party/markupsafe/ \
                'base/third_party/dmg_fp' \
                'base/third_party/dynamic_annotations' \
                'base/third_party/icu' \
@@ -1004,6 +1026,7 @@ remove_bundled_libraries() {
                'net/third_party/nss' \
                'third_party/WebKit' \
                'third_party/angle' \
+               'third_party/brotli' \
                'third_party/cacheinvalidation' \
                'third_party/cld' \
                'third_party/cros_system_api' \
@@ -1011,16 +1034,18 @@ remove_bundled_libraries() {
                'third_party/flot' \
                'third_party/hunspell' \
                'third_party/iccjpeg' \
+               'third_party/icu' \
                'third_party/jstemplate' \
                'third_party/khronos' \
                'third_party/leveldatabase' \
+               'third_party/libXNVCtrl' \
                'third_party/libaddressinput' \
                'third_party/libjingle' \
                'third_party/libphonenumber' \
                'third_party/libsrtp' \
                'third_party/libusb' \
+               'third_party/libwebm' \
                'third_party/libxml/chromium' \
-               'third_party/libXNVCtrl' \
                'third_party/libyuv' \
                'third_party/lss' \
                'third_party/lzma_sdk' \
@@ -1028,8 +1053,10 @@ remove_bundled_libraries() {
                'third_party/modp_b64' \
                'third_party/mt19937ar' \
                'third_party/npapi' \
+               'third_party/nss.isolate' \
                'third_party/ots' \
                'third_party/polymer' \
+               'third_party/protobuf' \
                'third_party/pywebsocket' \
                'third_party/qcms' \
                'third_party/readability' \
@@ -1060,7 +1087,7 @@ strip_system_dirs \
        third_party/bzip2 \
        third_party/ffmpeg_ \
        third_party/flac \
-       third_party/icu \
+       third_party/icu_ \
        third_party/jsoncpp \
        third_party/libXNVCtrl \
        third_party/libevent \

diff --git a/system-jinja.patch b/system-jinja.patch
index be9cc53de9167eefbbb47caee6032b30ff030cb3..e301016124e6753e4ae55f6c0396d1805b070346 100644 (file)
--- a/system-jinja.patch
+++ b/system-jinja.patch
@@ -1,17 +1,17 @@
---- third_party/WebKit/Source/bindings/derived_sources.gyp~    2014-01-18 20:26:07.000000000 +0200
-+++ third_party/WebKit/Source/bindings/derived_sources.gyp     2014-01-19 22:00:26.276535989 +0200
-@@ -53,9 +53,6 @@
-     ],
-     'compiler_module_files': [
-         'scripts/idl_compiler.py',
--        # jinja2/__init__.py contains version string, so sufficient for package
--        '<(DEPTH)/third_party/jinja2/__init__.py',
--        '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-         '<(DEPTH)/tools/idl_parser/idl_node.py',
-         '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig  2013-11-06 18:42:10.042086211 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi       2013-11-06 18:42:19.412146455 +0000
+--- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig     2014-02-20 03:49:21.821527295 +0000
++++ third_party/WebKit/Source/bindings/generated_bindings.gyp  2014-02-20 03:49:34.401607238 +0000
+@@ -110,9 +110,6 @@
+       'scripts/unstable/idl_compiler.py',
+       '<(DEPTH)/third_party/ply/lex.py',
+       '<(DEPTH)/third_party/ply/yacc.py',
+-      # jinja2/__init__.py contains version string, so sufficient for package
+-      '<(DEPTH)/third_party/jinja2/__init__.py',
+-      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
+       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+       '<(DEPTH)/tools/idl_parser/idl_node.py',
+       '<(DEPTH)/tools/idl_parser/idl_parser.py',
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig  2014-02-20 03:49:59.351765796 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi       2014-02-20 03:50:08.111821470 +0000
 @@ -1,10 +1,6 @@
  {
      'variables': {