updated patches

diff --git a/chromium-browser.spec b/chromium-browser.spec
index d717d6190b308204e919476a2b962bfa8c6b41ba..b2e68317a1bd3265d0069abe6a1cb16f2fb2b91d 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -106,8 +106,6 @@ Patch28:    system-mesa.patch
 Patch30:       system-ply.patch
 Patch31:       system-jinja.patch
 Patch32:       remove_bundled_libraries-stale.patch
-Patch33:       gn.patch
-Patch34:       depot-tools.patch
 Patch35:       etc-dir.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
@@ -307,13 +305,11 @@ ln -s %{SOURCE7} .
 %patch28 -p1
 %patch25 -p1
 %{?with_nacl:%patch18 -p1}
-%patch24 -p2
+%patch24 -p1
 %patch26 -p2
 #%patch30 -p1
 #%patch31 -p0
 %patch32 -p1
-%patch33 -p1
-%patch34 -p0
 %patch35 -p1
 
 sh -x clean-source.sh \

diff --git a/depot-tools.patch b/depot-tools.patch
deleted file mode 100644 (file)
index 19b92ce..0000000
--- a/depot-tools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig    2014-01-29 01:22:52.527247671 +0000
-+++ build/gyp_chromium 2014-01-29 01:23:49.857623290 +0000
-@@ -38,8 +38,6 @@
- sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
-     'Source', 'build', 'scripts'))
- 
--import find_depot_tools
--
- # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
- # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
- # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco

diff --git a/gn.patch b/gn.patch
deleted file mode 100644 (file)
index 6fd32cb..0000000
--- a/gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- chromium-browser-34.0.1847.116/build/gyp_chromium~ 2014-04-02 22:03:54.000000000 +0300
-+++ chromium-browser-34.0.1847.116/build/gyp_chromium  2014-04-12 01:46:51.740436678 +0300
-@@ -477,8 +477,7 @@
-     args.append('--check')
- 
-   supplemental_includes = GetSupplementalFiles()
--  if not RunGN(supplemental_includes):
--    sys.exit(1)
-+
-   args.extend(
-       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
- 

diff --git a/nacl-verbose.patch b/nacl-verbose.patch
index 30c91807b9fdc0713b524bb6fbfd01ac51901329..bfb411ded2a7fbc85e0e389eb522fe5b36b792a6 100644 (file)
--- a/nacl-verbose.patch
+++ b/nacl-verbose.patch
@@ -1,20 +1,29 @@
---- chromium-browser-25.0.1364.5/src/native_client/build/untrusted.gypi~       2013-01-05 22:28:19.000000000 +0200
-+++ chromium-browser-25.0.1364.5/src/native_client/build/untrusted.gypi        2013-01-05 22:29:09.503508356 +0200
-@@ -67,7 +67,7 @@
-           'build_newlib': 0,
-           'build_glibc': 0,
+--- chromium-browser-35.0.1916.114/native_client/build/untrusted.gypi~ 2014-05-14 22:23:54.000000000 +0300
++++ chromium-browser-35.0.1916.114/native_client/build/untrusted.gypi  2014-05-25 23:39:02.438068697 +0300
+@@ -57,7 +57,7 @@
+           'build_irt': 0,
            'disable_glibc%': 0,
+           'disable_bionic%': 1,
 -          'extra_args': [],
 +          'extra_args': ['--verbose'],
            'enable_x86_32': 1,
            'enable_x86_64': 1,
-           'extra_deps_newlib64': [],
-@@ -116,7 +116,7 @@
-           'nacl_enable_arm_gcc%': 0,
-           'build_glibc': 0,
+           'enable_arm': 0,
+@@ -114,7 +114,7 @@
+           'build_irt': 0,
            'disable_glibc%': 1,
+           'disable_bionic%': 1,
 -          'extra_args': [],
 +          'extra_args': ['--verbose'],
            'enable_x86_32': 0,
            'enable_x86_64': 0,
            'enable_arm': 1,
+@@ -166,7 +166,7 @@
+           'build_irt': 0,
+           'disable_glibc%': 1,
+           'disable_bionic%': 1,
+-          'extra_args': [],
++          'extra_args': ['--verbose'],
+           'enable_x86_32': 0,
+           'enable_x86_64': 0,
+           'enable_arm': 0,