[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 52
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Jul 24 18:53:58 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 104017f63e1db91e579f25bfa973673c25fb739b
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Jul 24 18:53:52 2016 +0000
refresh patches for chromium 52
---
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/gpu-timeout.patch | 2 +-
debian/patches/manpage.patch | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 40 +++++++++++-----------
debian/patches/system/nspr.patch | 4 +--
debian/patches/system/speechd.patch | 2 +-
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index 98f78f7..da7a1e0 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
-@@ -808,7 +808,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -809,7 +809,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 309ebd3..88a15d7 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
-@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -805,8 +805,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/gpu-timeout.patch b/debian/patches/gpu-timeout.patch
index 2829b40..be259e3 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
-@@ -90,7 +90,7 @@ const int kGpuTimeout = 30000;
+@@ -91,7 +91,7 @@ const int kGpuTimeout = 30000;
// infected machines.
const int kGpuTimeout = 15000;
#else
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index 39943c8..00b025a 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
-@@ -133,7 +133,7 @@
+@@ -117,7 +117,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
diff --git a/debian/patches/system/clang.patch b/debian/patches/system/clang.patch
index a3b8a70..5a5fc4a 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
-@@ -6005,8 +6005,8 @@
+@@ -5955,8 +5955,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 975eb88..4aa9b24 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
-@@ -1092,24 +1092,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1101,24 +1101,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());
@@ -40,11 +40,11 @@ Last-Update: <2015-07-26>
- }
- }
- scoped_ptr<MediaTracks> media_tracks(new MediaTracks());
+ std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
AVStream* audio_stream = NULL;
--- a/build/all.gyp
+++ b/build/all.gyp
-@@ -147,7 +147,7 @@
+@@ -152,7 +152,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
@@ -55,7 +55,7 @@ Last-Update: <2015-07-26>
'../third_party/libusb/libusb.gyp:*',
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
# details. http://crbug.com/558714
['OS!="android" and chromecast==0', {
'dependencies': [
@@ -75,7 +75,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -637,7 +637,7 @@
+@@ -650,7 +650,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -84,7 +84,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1270,7 +1270,7 @@
+@@ -1287,7 +1287,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -93,7 +93,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1413,7 +1413,7 @@
+@@ -1431,7 +1431,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -102,7 +102,7 @@ Last-Update: <2015-07-26>
],
}],
],
-@@ -1937,7 +1937,7 @@
+@@ -1960,7 +1960,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -144,7 +144,7 @@ Last-Update: <2015-07-26>
],
--- a/third_party/WebKit/Source/platform/blink_platform.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform.gyp
-@@ -352,7 +352,7 @@
+@@ -367,7 +367,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
@@ -153,17 +153,6 @@ 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
-@@ -1545,7 +1545,7 @@
- }, {
- 'dependencies': [
- # Runtime dependencis.
-- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
- '../third_party/mesa/mesa.gyp:osmesa',
- ],
- }],
--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -38,7 +38,7 @@
@@ -313,3 +302,14 @@ Last-Update: <2015-07-26>
],
'sources': [
'tools/media_bench/media_bench.cc',
+--- a/build/linux/unbundle/ffmpeg.gyp
++++ b/build/linux/unbundle/ffmpeg.gyp
+@@ -50,7 +50,7 @@
+ ],
+ },
+ 'includes': [
+- '../../build/shim_headers.gypi',
++ '../../shim_headers.gypi',
+ ],
+ 'link_settings': {
+ 'ldflags': [
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index fa97bd4..7ae434f 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
-@@ -660,8 +660,6 @@
+@@ -671,8 +671,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
@@ -10,7 +10,7 @@ Include system copy of prtime.h
- 'third_party/nspr/prtime.h',
'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h',
- 'thread_task_runner_handle.cc',
+ 'threading/non_thread_safe.h',
--- a/base/time/pr_time_unittest.cc
+++ b/base/time/pr_time_unittest.cc
@@ -7,7 +7,7 @@
diff --git a/debian/patches/system/speechd.patch b/debian/patches/system/speechd.patch
index dce87a1..df7431c 100644
--- a/debian/patches/system/speechd.patch
+++ b/debian/patches/system/speechd.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
-@@ -1141,7 +1141,7 @@
+@@ -1162,7 +1162,7 @@
# speech-dispatcher < 0.8 we can get rid of all this (including
# third_party/speech-dispatcher) and just include
# speech-dispatcher/libspeechd.h unconditionally.
--
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