[Pkg-chromium-commit] [pkg-chromium] 06/06: refresh patches for chromium 52

[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 cf4541dc7938b1d2a58c66d0e2c64b1ce3786362
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Jul 24 18:53:52 2016 +0000

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

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index a3b8a70..5a5fc4a 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
-@@ -6005,8 +6005,8 @@
+@@ -5955,8 +5955,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 309ebd3..88a15d7 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
-@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -805,8 +805,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 39943c8..00b025a 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
-@@ -133,7 +133,7 @@
+@@ -117,7 +117,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index fa97bd4..7ae434f 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
-@@ -660,8 +660,6 @@
+@@ -671,8 +671,6 @@
            'third_party/dmg_fp/g_fmt.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',
@@ -10,7 +10,7 @@ Include system copy of prtime.h
 -          'third_party/nspr/prtime.h',
            'third_party/superfasthash/superfasthash.c',
            'third_party/xdg_mime/xdgmime.h',
-           'thread_task_runner_handle.cc',
+           'threading/non_thread_safe.h',
 --- a/base/time/pr_time_unittest.cc
 +++ b/base/time/pr_time_unittest.cc
 @@ -7,7 +7,7 @@

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