[Pkg-chromium-commit] [pkg-chromium] 01/02: update patches for 50.0.2661.75
Michael Gilbert
mgilbert at moszumanska.debian.org
Thu Apr 14 22:42:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 81710395b748ff53fac35faa45a855764bec772d
Author: Michael Gilbert <mgilbert at debian.org>
Date: Thu Apr 14 22:41:50 2016 +0000
update patches for 50.0.2661.75
---
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/manpage.patch | 2 +-
debian/patches/ps-print.patch | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 22 +++++++++++-----------
debian/patches/system/nspr.patch | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index 5423429..dd73aba 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
-@@ -817,7 +817,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -811,7 +811,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 893347a..b19df10 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
-@@ -813,8 +813,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -807,8 +807,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 f1c686d..39943c8 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
-@@ -135,7 +135,7 @@
+@@ -133,7 +133,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index c97d70f..a278e61 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(
+@@ -344,6 +344,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 e865103..ad887c8 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
-@@ -6031,8 +6031,8 @@
+@@ -6003,8 +6003,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 26ac0fa..a0450d2 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -17,7 +17,7 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -875,7 +875,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
+@@ -874,7 +874,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
// this does not increase the amount of data downloaded. The default value
// is 5 AV_TIME_BASE units (1 second each), which prevents some oddly muxed
// streams from being detected properly; this value was chosen arbitrarily.
@@ -29,7 +29,7 @@ Last-Update: <2015-07-26>
// Open the AVFormatContext using our glue layer.
CHECK(blocking_thread_.Start());
-@@ -1035,24 +1039,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1034,24 +1038,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());
@@ -56,7 +56,7 @@ Last-Update: <2015-07-26>
AudioDecoderConfig audio_config;
--- a/build/all.gyp
+++ b/build/all.gyp
-@@ -144,7 +144,7 @@
+@@ -150,7 +150,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
@@ -87,7 +87,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -684,7 +684,7 @@
+@@ -620,7 +620,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -96,7 +96,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1357,7 +1357,7 @@
+@@ -1304,7 +1304,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -105,7 +105,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1521,7 +1521,7 @@
+@@ -1453,7 +1453,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -114,7 +114,7 @@ Last-Update: <2015-07-26>
],
}],
],
-@@ -2022,7 +2022,7 @@
+@@ -1974,7 +1974,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -136,7 +136,7 @@ Last-Update: <2015-07-26>
'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc',
--- a/third_party/WebKit/Source/core/core.gyp
+++ b/third_party/WebKit/Source/core/core.gyp
-@@ -339,7 +339,7 @@
+@@ -256,7 +256,7 @@
],
},
'dependencies': [
@@ -145,7 +145,7 @@ Last-Update: <2015-07-26>
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
-@@ -355,7 +355,7 @@
+@@ -272,7 +272,7 @@
# Windows shared builder needs extra help for linkage
['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
'export_dependent_settings': [
@@ -156,7 +156,7 @@ Last-Update: <2015-07-26>
],
--- a/third_party/WebKit/Source/platform/blink_platform.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform.gyp
-@@ -358,7 +358,7 @@
+@@ -376,7 +376,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
@@ -167,7 +167,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
-@@ -1631,7 +1631,7 @@
+@@ -1676,7 +1676,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 972d068..d462071 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
-@@ -634,8 +634,6 @@
+@@ -638,8 +638,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
--
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