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

[Michael Gilbert]

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

mgilbert pushed a commit to annotated tag debian/45.0.2454.85-1_deb8u1
in repository pkg-chromium.

commit c576ab9ba38cddd444ef6578a6d199ecda6787a4
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 13:41:20 2015 -0400

    refresh patches for chromium 45
---
 debian/patches/clang.patch                              |  2 +-
 debian/patches/disable/google-api-warning.patch         |  2 +-
 debian/patches/nspr.patch                               |  2 +-
 debian/patches/ps-print.patch                           |  2 +-
 debian/patches/system-speech.patch                      |  4 ++--
 debian/patches/third-party-cookies-off-by-default.patch | 12 ++++++------
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 6dcc55d..32ed095 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
-@@ -5860,8 +5860,8 @@
+@@ -5939,8 +5939,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 fc68407..58dc836 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
-@@ -833,8 +833,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -861,8 +861,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/nspr.patch b/debian/patches/nspr.patch
index a3f946e..b19913a 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
-@@ -613,8 +613,6 @@
+@@ -623,8 +623,6 @@
            'third_party/dmg_fp/g_fmt.cc',
            'third_party/icu/icu_utf.cc',
            'third_party/icu/icu_utf.h',
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index c97d70f..1fbf686 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
-@@ -343,6 +343,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -342,6 +342,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 e318ad0..5e8e694 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
-@@ -904,6 +904,26 @@
+@@ -896,6 +896,26 @@
        ],
      },
      {
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -2008,7 +2008,7 @@
+@@ -2060,7 +2060,7 @@
      ['enable_web_speech==1', {
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',
diff --git a/debian/patches/third-party-cookies-off-by-default.patch b/debian/patches/third-party-cookies-off-by-default.patch
index 756d73b..ebde120 100644
--- a/debian/patches/third-party-cookies-off-by-default.patch
+++ b/debian/patches/third-party-cookies-off-by-default.patch
@@ -1,14 +1,14 @@
 Description: Make default of third-party cookies the most secure for users.
 Author: Chad Miller <chad.miller at canonical.com>
 
---- a/chrome/browser/content_settings/cookie_settings.cc
-+++ b/chrome/browser/content_settings/cookie_settings.cc
-@@ -68,7 +68,7 @@ void CookieSettings::Factory::RegisterPr
+--- a/components/content_settings/core/browser/cookie_settings.cc
++++ b/components/content_settings/core/browser/cookie_settings.cc
+@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings(
+ void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
-       prefs::kBlockThirdPartyCookies,
--      false,
-+      true,
+-      prefs::kBlockThirdPartyCookies, false,
++      prefs::kBlockThirdPartyCookies, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  

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