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

[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 94ad4f4cc8d0067ce27f9f91fff3df32c948d632
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Dec 1 20:27:44 2014 -0500

    refresh patches for chromium 39
---
 debian/patches/clang.patch                      | 2 +-
 debian/patches/disable/google-api-warning.patch | 2 +-
 debian/patches/manpage.patch                    | 2 +-
 debian/patches/missing-include.patch            | 4 ++--
 debian/patches/ps-print.patch                   | 2 +-
 debian/patches/system-speech.patch              | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index f4f7c13..d4928d4 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
-@@ -5547,8 +5547,8 @@
+@@ -5683,8 +5683,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 1cae3ec..15419fb 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
-@@ -837,8 +837,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -829,8 +829,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 dfaec75..f147802 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
-@@ -122,7 +122,7 @@
+@@ -116,7 +116,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/missing-include.patch b/debian/patches/missing-include.patch
index 6dae7a8..73082c7 100644
--- a/debian/patches/missing-include.patch
+++ b/debian/patches/missing-include.patch
@@ -1,7 +1,7 @@
 --- a/media/cast/logging/encoding_event_subscriber.cc
 +++ b/media/cast/logging/encoding_event_subscriber.cc
-@@ -6,6 +6,7 @@
- 
+@@ -7,6 +7,7 @@
+ #include <algorithm>
  #include <cstring>
  #include <utility>
 +#include <algorithm>
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index db1b395..ecb12ff 100644
--- a/debian/patches/ps-print.patch
+++ b/debian/patches/ps-print.patch
@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
 
 --- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
 +++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
-@@ -336,6 +336,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -337,6 +337,7 @@ void PrintDialogGtk2::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
    // TODO(thestig) Add more capabilities to support?
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 6dec91c..0115c5e 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -2,7 +2,7 @@ description: use system speex
 
 --- a/build/linux/system.gyp
 +++ b/build/linux/system.gyp
-@@ -649,6 +649,26 @@
+@@ -693,6 +693,26 @@
        ],
      },
      {
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1837,7 +1837,7 @@
+@@ -1849,7 +1849,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