From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 15 Nov 2015 11:56:29 +0000 (+0200)
Subject: updated patches
X-Git-Tag: auto/th/chromium-browser-47.0.2526.73-1~1^2~6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser.git;a=commitdiff_plain;h=af2c03655f6a0f404f752a848462a8418e9ea760

updated patches
---

diff --git a/ffmpeg-generate-errors.patch b/ffmpeg-generate-errors.patch
index 348ed25..4e3373f 100644
--- a/ffmpeg-generate-errors.patch
+++ b/ffmpeg-generate-errors.patch
@@ -5,8 +5,8 @@ fix error reporting:
     exit('Failed to find file', include_file_path)
 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
+--- chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py~	2015-11-15 00:56:33.000000000 +0200
++++ chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-11-15 10:57:18.342220254 +0200
 @@ -149,6 +150,9 @@
  # Mac doesn't have any platform specific files, so just use linux and win.
  SUPPORTED_PLATFORMS = ['linux', 'win']
@@ -17,12 +17,12 @@ TypeError: __call__() takes at most 2 arguments (3 given)
  
  def NormalizeFilename(name):
    """ Removes leading path separators in an attempt to normalize paths."""
-@@ -753,7 +757,7 @@
+@@ -850,7 +850,7 @@
      elif include_file_path in IGNORED_INCLUDE_FILES:
        continue
      else:
--      exit('Failed to find file', include_file_path)
-+      die('Failed to find file: ' + include_file_path)
+-      exit('Failed to find file ' + include_file_path)
++      die('Failed to find file ' + include_file_path)
  
      # At this point we've found the file. Check if its in our ignore list which
      # means that the list should be updated to no longer mention this file.
@@ -53,12 +53,12 @@ TypeError: __call__() takes at most 2 arguments (3 given)
           'Are build_dir (%s) and/or source_dir (%s) options correct?' %
                (options.build_dir, options.source_dir))
  
-@@ -904,7 +908,7 @@
+@@ -1017,7 +1017,7 @@
  
-   if not CheckLicensesForStaticLinking(sets, source_dir,
+   if not CheckLicensesForStaticLinking(sources_to_check, source_dir,
                                         options.print_licenses):
--    exit ('GENERATE FAILED: invalid licenses detected.')
+-    exit('GENERATE FAILED: invalid licenses detected.')
 +    die('GENERATE FAILED: invalid licenses detected.')
    print 'License checks passed.'
+   UpdateCredits(sources_to_check, source_dir)
  
-   # Open for writing.
diff --git a/ffmpeg-generate.patch b/ffmpeg-generate.patch
index 9cae492..d03ed22 100644
--- a/ffmpeg-generate.patch
+++ b/ffmpeg-generate.patch
@@ -1,10 +1,10 @@
---- chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py~	2015-07-27 07:21:59.000000000 +0300
-+++ chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-07-27 07:22:03.210572817 +0300
-@@ -757,7 +757,8 @@
+--- chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py~	2015-11-15 11:03:38.000000000 +0200
++++ chromium-browser-47.0.2526.58/third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-11-15 13:49:46.409735857 +0200
+@@ -850,7 +850,8 @@
      elif include_file_path in IGNORED_INCLUDE_FILES:
        continue
      else:
--      die('Failed to find file: ' + include_file_path)
+-      die('Failed to find file ' + include_file_path)
 +      print('Failed to find file: ' + include_file_path)
 +      continue