[Pkg-chromium-commit] [pkg-chromium] 01/04: refresh patches for chromium 47

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch jessie
in repository pkg-chromium.

commit 81da6c7678a1073c36e4a0e221f7f9a1a361ba4f
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Tue Dec 8 01:50:56 2015 +0000

    refresh patches for chromium 47
---
 debian/patches/chromedriver-revision.patch      | 2 +-
 debian/patches/clang.patch                      | 2 +-
 debian/patches/disable/google-api-warning.patch | 2 +-
 debian/patches/manpage.patch                    | 2 +-
 debian/patches/nspr.patch                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/chromedriver-revision.patch b/debian/patches/chromedriver-revision.patch
index 9f5d7bf..0ef12c9 100644
--- a/debian/patches/chromedriver-revision.patch
+++ b/debian/patches/chromedriver-revision.patch
@@ -3,7 +3,7 @@ description: set chromedriver version as undefined
 --- a/chrome/test/chromedriver/embed_version_in_cpp.py
 +++ b/chrome/test/chromedriver/embed_version_in_cpp.py
 @@ -26,7 +26,7 @@ def main():
-   options, args = parser.parse_args()
+   options, _ = parser.parse_args()
  
    version = open(options.version_file, 'r').read().strip()
 -  revision = lastchange.FetchVersionInfo(None).revision
diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 90a1fdd..cc4c3bf 100644
--- a/debian/patches/clang.patch
+++ b/debian/patches/clang.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/build/common.gypi
 +++ b/build/common.gypi
-@@ -5986,8 +5986,8 @@
+@@ -5954,8 +5954,8 @@
      ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
          'and OS!="win"', {
        'make_global_settings': [
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 893347a..b5a0ffd 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -813,8 +813,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -815,8 +815,6 @@ void StartupBrowserCreatorImpl::AddInfoB
    if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
        !command_line_.HasSwitch(switches::kTestType)) {
      chrome::ShowBadFlagsPrompt(browser);
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index 499fc88..da4008d 100644
--- a/debian/patches/manpage.patch
+++ b/debian/patches/manpage.patch
@@ -42,7 +42,7 @@ Author: Daniel Echeverry <epsilon77 at gmail.com>
  .SH ENVIRONMENT
 --- a/chrome/chrome_exe.gypi
 +++ b/chrome/chrome_exe.gypi
-@@ -137,7 +137,7 @@
+@@ -128,7 +128,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 7b4f54e..e3ea844 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -2,7 +2,7 @@ Include system copy of prtime.h
 
 --- a/base/base.gypi
 +++ b/base/base.gypi
-@@ -621,8 +621,6 @@
+@@ -622,8 +622,6 @@
            'third_party/dmg_fp/g_fmt.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git