[Pkg-chromium-commit] [pkg-chromium] 01/01: refresh patches for chromium 46

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch jessie
in repository pkg-chromium.

commit e1a01d6f77fcb878a43987e6cf0d99fbf4b86b58
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Oct 17 04:32:02 2015 -0400

    refresh patches for chromium 46
---
 debian/patches/clang.patch                      |  2 +-
 debian/patches/disable/google-api-warning.patch |  2 +-
 debian/patches/nspr.patch                       |  2 +-
 debian/patches/series                           |  3 +-
 debian/patches/system-speech.patch              | 53 -------------------------
 debian/patches/webui.patch                      | 10 +++++
 6 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 32ed095..90a1fdd 100644
--- a/debian/patches/clang.patch
+++ b/debian/patches/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/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/nspr.patch b/debian/patches/nspr.patch
index b19913a..7b4f54e 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/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/series b/debian/patches/series
index f9f4f7b..7673b00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,8 @@ disable/google-api-warning.patch
 
 nspr.patch
 prefs.patch
-system-speech.patch
 third-party-cookies-off-by-default.patch
 ps-print.patch
 chromedriver-revision.patch
+
+webui.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
deleted file mode 100644
index 5e8e694..0000000
--- a/debian/patches/system-speech.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