[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 46
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Oct 17 08:33:01 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 2e73b4fcc8082db02eb6220f6e28b1ec81a15f7d
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Oct 17 04:32:02 2015 -0400
refresh patches for chromium 46
---
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/external-components.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/series | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 26 +++++------
debian/patches/system/nspr.patch | 2 +-
debian/patches/system/speex.patch | 53 ----------------------
debian/patches/webui.patch | 10 ++++
9 files changed, 29 insertions(+), 72 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index ddf169f..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
-@@ -865,7 +865,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 c198900..4782ac5 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
-@@ -52,6 +52,9 @@ bool ExternalComponentLoader::IsModifiab
+@@ -35,6 +35,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 58dc836..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
-@@ -861,8 +861,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/series b/debian/patches/series
index fd9b991..d035781 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,6 @@ master-preferences.patch
chromedriver-revision.patch
system/nspr.patch
-system/speex.patch
system/clang.patch
system/ffmpeg.patch
+webui.patch
diff --git a/debian/patches/system/clang.patch b/debian/patches/system/clang.patch
index 32ed095..90a1fdd 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
-@@ -5939,8 +5939,8 @@
+@@ -5986,8 +5986,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 ff4aedb..6c69ffa 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
-@@ -843,24 +843,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -944,24 +944,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());
@@ -77,7 +77,7 @@ Last-Update: <2015-07-26>
'<(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 @@
+@@ -221,7 +221,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -86,7 +86,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -243,7 +243,7 @@
+@@ -244,7 +244,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -95,7 +95,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -356,7 +356,7 @@
+@@ -357,7 +357,7 @@
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -106,7 +106,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -628,7 +628,7 @@
+@@ -635,7 +635,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -115,16 +115,16 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1256,7 +1256,7 @@
+@@ -1306,7 +1306,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
- }, { # media_use_ffmpeg== 0
+ }, { # media_use_ffmpeg==0
'sources!': [
-@@ -1382,7 +1382,7 @@
+@@ -1449,7 +1449,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -133,7 +133,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1843,7 +1843,7 @@
+@@ -1914,7 +1914,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -144,8 +144,8 @@ Last-Update: <2015-07-26>
'media_test_support',
--- a/media/media_cdm.gypi
+++ b/media/media_cdm.gypi
-@@ -42,7 +42,7 @@
- ['use_ffmpeg == 1' , {
+@@ -38,7 +38,7 @@
+ ['media_use_ffmpeg == 1' , {
'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
'dependencies': [
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ -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
-@@ -406,7 +406,7 @@
+@@ -409,7 +409,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
-@@ -1569,7 +1569,7 @@
+@@ -1581,7 +1581,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index b19913a..7b4f54e 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
-@@ -623,8 +623,6 @@
+@@ -621,8 +621,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
deleted file mode 100644
index 5e8e694..0000000
--- a/debian/patches/system/speex.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-description: use system speex
-
---- a/build/linux/system.gyp
-+++ b/build/linux/system.gyp
-@@ -896,6 +896,26 @@
- ],
- },
- {
-+ 'target_name': 'speex',
-+ 'type': 'none',
-+ 'conditions': [
-+ ['_toolset=="target"', {
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags speex)',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l speex)',
-+ ],
-+ },
-+ }]]
-+ },
-+ {
- 'target_name': 'gnome_keyring',
- 'type': 'none',
- 'conditions': [
---- a/content/browser/speech/audio_encoder.cc
-+++ b/content/browser/speech/audio_encoder.cc
-@@ -11,7 +11,7 @@
- #include "base/strings/string_number_conversions.h"
- #include "content/browser/speech/audio_buffer.h"
- #include "third_party/flac/include/FLAC/stream_encoder.h"
--#include "third_party/speex/include/speex/speex.h"
-+#include <speex/speex.h>
-
- namespace content {
- namespace {
---- a/content/content_browser.gypi
-+++ b/content/content_browser.gypi
-@@ -2060,7 +2060,7 @@
- ['enable_web_speech==1', {
- 'dependencies': [
- '../third_party/flac/flac.gyp:libflac',
-- '../third_party/speex/speex.gyp:libspeex',
-+ '../build/linux/system.gyp:speex',
- ],
- }],
- ['enable_web_speech==0 and OS=="android"', {
diff --git a/debian/patches/webui.patch b/debian/patches/webui.patch
new file mode 100644
index 0000000..187c648
--- /dev/null
+++ b/debian/patches/webui.patch
@@ -0,0 +1,10 @@
+--- a/chrome/test/data/webui_test_resources.grd
++++ b/chrome/test/data/webui_test_resources.grd
+@@ -8,7 +8,6 @@
+ </outputs>
+ <release seq="1">
+ <includes>
+- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+ </includes>
+ </release>
+ </grit>
--
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