up to 32.0.1700.77

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 9cd03b4a7988ad99397332ba22b12ebeb2e0b43a..483afee1e839aab9e03d9f51b50277a01b2a4550 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -59,9 +59,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          31.0.1650
-%define                basever         57
-%define                patchver        63
+%define                branch          32.0.1700
+%define                basever         77
+#define                patchver        63
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
@@ -70,11 +70,11 @@ Version:    %{branch}.%{patchver}
 %else
 Version:       %{branch}.%{basever}
 %endif
-Release:       3
+Release:       0.2
 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: 8fcdee6bdefad83dedaecc7ca2a1cf5f
+# Source0-md5: 591fde5a952808fe06cb24030e6c29f1
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  f17f75a65414167cf822c6aaf409a537
@@ -103,7 +103,6 @@ Patch24:    nacl-verbose.patch
 Patch25:       gnome3-volume-control.patch
 Patch26:       master-prefs-path.patch
 Patch28:       system-mesa.patch
-Patch29:       system-icu.patch
 Patch30:       system-ply.patch
 Patch31:       system-jinja.patch
 Patch32:       remove_bundled_libraries-stale.patch
@@ -300,7 +299,6 @@ ln -s %{SOURCE7} .
 %{?with_nacl:%patch18 -p1}
 %patch24 -p2
 %patch26 -p2
-%patch29 -p0
 %patch30 -p1
 %patch31 -p0
 %patch32 -p1

diff --git a/clean-source.sh b/clean-source.sh
index 8be5d5e3ef0d058d18a407605d80feffd9dd082f..2867bb10f856013e4330cffb19a85b281598d0e6 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -62,10 +62,10 @@ remove_nonessential_dirs() {
        chrome/app/resources/terms/chromeos \
        chrome/app/theme/default_100_percent/cros_ \
        chrome/app/theme/default_100_percent/mac_ \
-       chrome/app/theme/default_100_percent/win \
+       chrome/app/theme/default_100_percent/win_ \
        chrome/app/theme/default_200_percent/cros_ \
        chrome/app/theme/default_200_percent/mac \
-       chrome/app/theme/default_200_percent/win \
+       chrome/app/theme/default_200_percent/win_ \
        chrome/app/theme/touch_100_percent/win \
        chrome/app/theme/touch_140_percent/win \
        chrome/app/theme/touch_180_percent/win \

diff --git a/system-icu.patch b/system-icu.patch
deleted file mode 100644 (file)
index 5138afc..0000000
--- a/system-icu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build/linux/unbundle/icu.gyp.orig  2013-09-27 18:18:50.531839532 +0000
-+++ build/linux/unbundle/icu.gyp       2013-09-27 18:19:08.301950500 +0000
-@@ -7,6 +7,7 @@
-     {
-       'target_name': 'system_icu',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'direct_dependent_settings': {
-         'defines': [
-           'U_USING_ICU_NAMESPACE=0',
-@@ -30,6 +31,7 @@
-     {
-       'target_name': 'icui18n',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {
-@@ -116,6 +118,7 @@
-     {
-       'target_name': 'icuuc',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {

diff --git a/system-jinja.patch b/system-jinja.patch
index b099cf37a69f83e402f435432e12733c3ed5e6b0..f5f7c4d48c363aef5a60129767c04491b88d8887 100644 (file)
--- a/system-jinja.patch
+++ b/system-jinja.patch
@@ -1,13 +1,27 @@
---- third_party/WebKit/Source/core/core.gypi.orig      2013-09-27 18:25:24.634284363 +0000
-+++ third_party/WebKit/Source/core/core.gypi   2013-09-27 18:25:48.614432099 +0000
-@@ -3863,10 +3863,6 @@
-             'tests/TreeTestHelpers.h',
-         ],
+--- third_party/WebKit/Source/bindings/derived_sources.gyp.orig        2013-11-06 18:36:38.369949986 +0000
++++ third_party/WebKit/Source/bindings/derived_sources.gyp     2013-11-06 18:37:06.980134563 +0000
+@@ -53,11 +53,6 @@
+     ],
+     'compiler_module_files': [
+         'scripts/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  2013-11-06 18:42:10.042086211 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi       2013-11-06 18:42:19.412146455 +0000
+@@ -1,10 +1,6 @@
+ {
+     'variables': {
          'scripts_for_in_files': [
 -            # jinja2/__init__.py contains version string, so sufficient as
 -            # dependency for whole jinja2 package
 -            '<(DEPTH)/third_party/jinja2/__init__.py',
 -            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'scripts/in_file.py',
-             'scripts/in_generator.py',
-             'scripts/license.py',
+             'hasher.py',
+             'in_file.py',
+             'in_generator.py',