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

[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 ef84fa326e384c1f3332cae6e30722082cee3352
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Mar 5 00:57:27 2016 +0000

    refresh patches for chromium 49
---
 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                       | 15 +++++++--------
 debian/patches/ps-print.patch                   |  2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 8536325..e865103 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
-@@ -5980,8 +5980,8 @@
+@@ -6031,8 +6031,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 ca3944c..893347a 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
-@@ -810,8 +810,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -813,8 +813,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 04a0250..9b8b2cf 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
+@@ -156,7 +156,7 @@ void AppListService::RegisterPrefs(PrefR
  
    // Identifies whether we should show the app launcher promo or not. This
    // becomes false when the user dismisses the promo.
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index f39b7b9..f1c686d 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
-@@ -129,7 +129,7 @@
+@@ -135,7 +135,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 1ee8084..972d068 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
-@@ -627,8 +627,6 @@
+@@ -634,8 +634,6 @@
            'third_party/dmg_fp/g_fmt.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',
@@ -13,24 +13,23 @@ Include system copy of prtime.h
            'thread_task_runner_handle.cc',
 --- a/base/time/pr_time_unittest.cc
 +++ b/base/time/pr_time_unittest.cc
-@@ -6,7 +6,7 @@
- #include <time.h>
+@@ -7,7 +7,7 @@
  
  #include "base/compiler_specific.h"
+ #include "base/macros.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
  #include "base/time/time.h"
+ #include "build/build_config.h"
  #include "testing/gtest/include/gtest/gtest.h"
- 
 --- a/base/time/time.cc
 +++ b/base/time/time.cc
-@@ -13,7 +13,8 @@
- #include "base/lazy_instance.h"
+@@ -14,7 +14,7 @@
  #include "base/logging.h"
+ #include "base/macros.h"
  #include "base/strings/stringprintf.h"
 -#include "base/third_party/nspr/prtime.h"
-+
 +#include <nspr/prtime.h>
+ #include "build/build_config.h"
  
  namespace base {
- 
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index 1fbf686..c97d70f 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
-@@ -342,6 +342,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -343,6 +343,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>(

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