[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 42

[Michael Gilbert]

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

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

commit 9fd25473247275c62cacfd19cff4f6007681b1d3
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Thu Apr 16 01:17:50 2015 -0400

    refresh patches for chromium 42
---
 debian/patches/clang.patch                      | 2 +-
 debian/patches/disable/google-api-warning.patch | 2 +-
 debian/patches/disable/promo.patch              | 2 +-
 debian/patches/manpage.patch                    | 2 +-
 debian/patches/nspr.patch                       | 6 +++---
 debian/patches/system-speech.patch              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index f57fb17..9bf03d7 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
-@@ -5696,8 +5696,8 @@
+@@ -5754,8 +5754,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 ccc4bf4..fc68407 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
-@@ -827,8 +827,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -833,8 +833,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/disable/promo.patch b/debian/patches/disable/promo.patch
index 4f11493..2e04571 100644
--- a/debian/patches/disable/promo.patch
+++ b/debian/patches/disable/promo.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/634101
 
 --- a/chrome/browser/ui/app_list/app_list_service.cc
 +++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -153,7 +153,7 @@ void AppListService::RegisterPrefs(PrefR
+@@ -154,7 +154,7 @@ void AppListService::RegisterPrefs(PrefR
    // Identifies whether we should show the app launcher promo or not.
    // Note that a field trial also controls the showing, so the promo won't show
    // unless the pref is set AND the field trial is set to a proper group.
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index f094262..3282065 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
-@@ -124,7 +124,7 @@
+@@ -127,7 +127,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 707894f..6acd6d2 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -2,15 +2,15 @@ Include system copy of prtime.h
 
 --- a/base/base.gypi
 +++ b/base/base.gypi
-@@ -18,8 +18,6 @@
-           'third_party/dmg_fp/dtoa_wrapper.cc',
+@@ -598,8 +598,6 @@
+           'third_party/dmg_fp/g_fmt.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',
 -          'third_party/nspr/prtime.cc',
 -          'third_party/nspr/prtime.h',
            'third_party/superfasthash/superfasthash.c',
            'third_party/xdg_mime/xdgmime.h',
-           'allocator/allocator_extension.cc',
+           'thread_task_runner_handle.cc',
 --- a/base/time/pr_time_unittest.cc
 +++ b/base/time/pr_time_unittest.cc
 @@ -6,7 +6,7 @@
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index cfec79c..25bdd01 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1919,7 +1919,7 @@
+@@ -1935,7 +1935,7 @@
      ['enable_web_speech==1', {
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',

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