up to 45.0.2454.93, updated patches

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 128e4d26aae3825d224114b212bed7b61a21043c..17cdbfd832d5ae0a854180e4cce58a25cbbfdcf4 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -73,7 +73,7 @@
 # - to look for new tarball, use update-source.sh script
 
 %define                branch          45.0.2454
-%define                basever         26
+%define                basever         93
 #define                patchver        130
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
@@ -86,8 +86,8 @@ 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/beta/%{name}-%{branch}.%{basever}.tar.gz
-# Source0-md5: 4cc5d5b965f1bfc99fb387828ef48295
+Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+# Source0-md5: 86ca42690aab362a0d1e1b61dddc5349
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  02973b87b9564ed36220497b4bf83109

diff --git a/ffmpeg-generate-errors.patch b/ffmpeg-generate-errors.patch
index 894def3cb1307b872aab69c90c485753caf3f9b7..348ed25005f82c48ffca7ba439430ff8718f3269 100644 (file)
--- a/ffmpeg-generate-errors.patch
+++ b/ffmpeg-generate-errors.patch
@@ -7,14 +7,6 @@ TypeError: __call__() takes at most 2 arguments (3 given)
 
 --- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py~     2015-07-27 07:15:51.000000000 +0300
 +++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py      2015-07-27 07:15:55.928135410 +0300
-@@ -79,6 +79,7 @@
- import string
- import subprocess
- import shutil
-+import sys
- 
- COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
 @@ -149,6 +150,9 @@
  # Mac doesn't have any platform specific files, so just use linux and win.
  SUPPORTED_PLATFORMS = ['linux', 'win']

diff --git a/nacl-verbose.patch b/nacl-verbose.patch
index 8fcd123d8c0e8b198ff0ac5c15aafbbfea069297..e224857a28bfef42f11c87aae91ffcfc9290487d 100644 (file)
--- a/nacl-verbose.patch
+++ b/nacl-verbose.patch
@@ -1,7 +1,7 @@
---- chromium-browser-45.0.2454.26/native_client/build/untrusted.gypi~  2015-08-09 15:45:16.000000000 +0300
-+++ chromium-browser-45.0.2454.26/native_client/build/untrusted.gypi   2015-08-09 19:39:50.812639234 +0300
-@@ -57,7 +57,7 @@
-           'build_irt': 0,
+--- chromium-browser-45.0.2454.93/native_client/build/untrusted.gypi~  2015-09-17 12:53:04.000000000 +0300
++++ chromium-browser-45.0.2454.93/native_client/build/untrusted.gypi   2015-09-17 12:53:34.318584373 +0300
+@@ -96,7 +96,7 @@
+           'build_nonsfi_helper': 0,
            'disable_glibc%': 0,
            'disable_bionic%': 1,
 -          'extra_args': [],
@@ -9,21 +9,21 @@
            'enable_x86_32': 1,
            'enable_x86_64': 1,
            'enable_arm': 0,
-@@ -114,7 +114,7 @@
-           'build_irt': 0,
-           'disable_glibc%': 1,
+@@ -153,7 +153,7 @@
+           'build_nonsfi_helper': 0,
+           'disable_glibc%': 0,
            'disable_bionic%': 1,
 -          'extra_args': [],
 +          'extra_args': ['--verbose'],
            'enable_x86_32': 0,
            'enable_x86_64': 0,
            'enable_arm': 1,
-@@ -153,7 +153,7 @@
+@@ -203,7 +203,7 @@
            'build_nonsfi_helper': 0,
-           'disable_glibc%': 0,
+           'disable_glibc%': 1,
            'disable_bionic%': 1,
 -          'extra_args': [],
 +          'extra_args': ['--verbose'],
            'enable_x86_32': 0,
            'enable_x86_64': 0,
-           'enable_arm': 1,
+           'enable_arm': 0,