[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 49
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Mar 5 00:58:10 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 e38dd5429c792f074a8a40f6a65b41e58fe0fac8
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Mar 5 00:57:27 2016 +0000
refresh patches for chromium 49
---
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/external-components.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/disable/promo.patch | 2 +-
debian/patches/gpu-timeout.patch | 2 +-
debian/patches/manpage.patch | 2 +-
debian/patches/ps-print.patch | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 72 ++++++++--------------
debian/patches/system/nspr.patch | 15 +++--
10 files changed, 42 insertions(+), 61 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index 31093ad..5423429 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
-@@ -814,7 +814,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -817,7 +817,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 f06b405..0943afb 100644
--- a/debian/patches/disable/external-components.patch
+++ b/debian/patches/disable/external-components.patch
@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -38,6 +38,9 @@ ExternalComponentLoader::~ExternalCompon
+@@ -39,6 +39,9 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
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/gpu-timeout.patch b/debian/patches/gpu-timeout.patch
index dc34d37..2c44fce 100644
--- a/debian/patches/gpu-timeout.patch
+++ b/debian/patches/gpu-timeout.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
-@@ -84,7 +84,7 @@
+@@ -88,7 +88,7 @@
#if defined(CYGPROFILE_INSTRUMENTATION)
const int kGpuTimeout = 30000;
#else
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/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>(
diff --git a/debian/patches/system/clang.patch b/debian/patches/system/clang.patch
index 8536325..e865103 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
-@@ -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/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index d3e2be3..26ac0fa 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -7,7 +7,7 @@ Last-Update: <2015-07-26>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -36,7 +36,6 @@ extern "C" {
+@@ -38,7 +38,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -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
-@@ -862,7 +862,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
+@@ -875,7 +875,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,20 +29,20 @@ Last-Update: <2015-07-26>
// Open the AVFormatContext using our glue layer.
CHECK(blocking_thread_.Start());
-@@ -1019,24 +1023,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1035,24 +1039,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());
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
+- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
+- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
@@ -56,7 +56,7 @@ Last-Update: <2015-07-26>
AudioDecoderConfig audio_config;
--- a/build/all.gyp
+++ b/build/all.gyp
-@@ -135,7 +135,7 @@
+@@ -144,7 +144,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
@@ -67,35 +67,17 @@ Last-Update: <2015-07-26>
'../third_party/libusb/libusb.gyp:*',
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
-@@ -15,7 +15,7 @@
- 'cast_net',
- 'cast_receiver',
- '<(DEPTH)/testing/gtest.gyp:gtest',
-- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
- '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
- '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-@@ -220,7 +220,7 @@
- '<(DEPTH)/net/net.gyp:net_test_support',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/testing/gtest.gyp:gtest',
-- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
- '<(DEPTH)/third_party/opus/opus.gyp:opus',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
- ],
-@@ -243,7 +243,7 @@
- '<(DEPTH)/net/net.gyp:net_test_support',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/testing/gtest.gyp:gtest',
-- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
- '<(DEPTH)/third_party/opus/opus.gyp:opus',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
- ],
-@@ -356,7 +356,7 @@
- '<(DEPTH)/base/base.gyp:test_support_base',
+@@ -63,7 +63,7 @@
+ # details. http://crbug.com/558714
+ ['OS!="android" and chromecast==0', {
+ 'dependencies': [
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ 'sources': [
+ 'test/fake_media_source.cc',
+@@ -166,7 +166,7 @@
+ 'cast_test_utility',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ -105,7 +87,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -649,7 +649,7 @@
+@@ -684,7 +684,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -114,7 +96,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1334,7 +1334,7 @@
+@@ -1357,7 +1357,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -123,16 +105,16 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1489,7 +1489,7 @@
+@@ -1521,7 +1521,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
- }, { # media_use_ffmpeg==0
- 'sources!': [
-@@ -1981,7 +1981,7 @@
+ }],
+ ],
+@@ -2022,7 +2022,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -154,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
-@@ -383,7 +383,7 @@
+@@ -339,7 +339,7 @@
],
},
'dependencies': [
@@ -163,7 +145,7 @@ Last-Update: <2015-07-26>
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
-@@ -399,7 +399,7 @@
+@@ -355,7 +355,7 @@
# Windows shared builder needs extra help for linkage
['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
'export_dependent_settings': [
@@ -174,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
-@@ -409,7 +409,7 @@
+@@ -358,7 +358,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
@@ -185,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
-@@ -1609,7 +1609,7 @@
+@@ -1631,7 +1631,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 1ee8084..972d068 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
-@@ -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 {
-
--
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