[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 45
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Sep 5 14:55:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit fd26405cc019dd50e5a9ac52e99c762a9546db6b
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Sep 5 10:54:12 2015 -0400
refresh patches for chromium 45
---
debian/patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/external-components.patch | 8 ++++----
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/disable/third-party-cookies.patch | 12 ++++++------
debian/patches/ps-print.patch | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 14 +++++++-------
debian/patches/system/nspr.patch | 2 +-
debian/patches/system/speex.patch | 4 ++--
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index d1256b0..ddf169f 100644
--- a/debian/patches/disable/default-browser-warning.patch
+++ b/debian/patches/disable/default-browser-warning.patch
@@ -2,7 +2,7 @@ description: never show the default browser question
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -837,7 +837,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -865,7 +865,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)
diff --git a/debian/patches/disable/external-components.patch b/debian/patches/disable/external-components.patch
index 60e04d0..c198900 100644
--- a/debian/patches/disable/external-components.patch
+++ b/debian/patches/disable/external-components.patch
@@ -1,12 +1,12 @@
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -51,6 +51,9 @@ bool ExternalComponentLoader::IsModifiab
+@@ -52,6 +52,9 @@ bool ExternalComponentLoader::IsModifiab
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
+ LoadFinished();
+ return;
+
- std::string app_id = extension_misc::kInAppPaymentsSupportAppId;
- prefs_->SetString(app_id + ".external_update_url",
- extension_urls::GetWebstoreUpdateUrl().spec());
+ AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
+
+ if (HotwordServiceFactory::IsHotwordAllowed(profile_))
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/disable/third-party-cookies.patch b/debian/patches/disable/third-party-cookies.patch
index 74ef55b..3b0b760 100644
--- a/debian/patches/disable/third-party-cookies.patch
+++ b/debian/patches/disable/third-party-cookies.patch
@@ -1,14 +1,14 @@
description: disable third-party cookies by default
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);
}
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/clang.patch b/debian/patches/system/clang.patch
index 6dcc55d..32ed095 100644
--- a/debian/patches/system/clang.patch
+++ b/debian/patches/system/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/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index 4f42510..ff4aedb 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -30,7 +30,7 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -834,24 +834,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -843,24 +843,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
@@ -106,7 +106,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -610,7 +610,7 @@
+@@ -628,7 +628,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -115,7 +115,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1226,7 +1226,7 @@
+@@ -1256,7 +1256,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -124,7 +124,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg== 0
'sources!': [
-@@ -1351,7 +1351,7 @@
+@@ -1382,7 +1382,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -133,7 +133,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1822,7 +1822,7 @@
+@@ -1843,7 +1843,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -175,7 +175,7 @@ Last-Update: <2015-07-26>
],
--- a/third_party/WebKit/Source/platform/blink_platform.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform.gyp
-@@ -401,7 +401,7 @@
+@@ -406,7 +406,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
@@ -186,7 +186,7 @@ Last-Update: <2015-07-26>
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
-@@ -1530,7 +1530,7 @@
+@@ -1569,7 +1569,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index a3f946e..b19913a 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/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/system/speex.patch b/debian/patches/system/speex.patch
index e318ad0..5e8e694 100644
--- a/debian/patches/system/speex.patch
+++ b/debian/patches/system/speex.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',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list