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

[Michael Gilbert]

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

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

commit 1c7cf025c30de337b1a81c2d2adf4ad3523bab77
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Jan 24 11:48:40 2015 -0500

    refresh patches for chromium 40
---
 debian/patches/chromedriver-revision.patch      | 10 +++++-----
 debian/patches/clang.patch                      |  2 +-
 debian/patches/disable/google-api-warning.patch |  2 +-
 debian/patches/expat.patch                      |  2 +-
 debian/patches/nspr.patch                       |  4 ++--
 debian/patches/system-speech.patch              |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/chromedriver-revision.patch b/debian/patches/chromedriver-revision.patch
index d05db7b..9f5d7bf 100644
--- a/debian/patches/chromedriver-revision.patch
+++ b/debian/patches/chromedriver-revision.patch
@@ -1,13 +1,13 @@
 description: set chromedriver version as undefined
 
---- chromium.orig/chrome/test/chromedriver/embed_version_in_cpp.py	2014-04-11 01:43:42.224278647 +0000
-+++ chromium/chrome/test/chromedriver/embed_version_in_cpp.py	2014-04-11 01:43:42.220278647 +0000
-@@ -25,7 +25,7 @@
+--- a/chrome/test/chromedriver/embed_version_in_cpp.py
++++ b/chrome/test/chromedriver/embed_version_in_cpp.py
+@@ -26,7 +26,7 @@ def main():
    options, args = parser.parse_args()
  
    version = open(options.version_file, 'r').read().strip()
 -  revision = lastchange.FetchVersionInfo(None).revision
 +  revision = "undefined"
-   if revision:
-     version += '.' + revision.strip()
  
+   if revision:
+     match = re.match('([0-9a-fA-F]+)(-refs/heads/master@{#(\d+)})?', revision)
diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index d4928d4..dc2b295 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
-@@ -5683,8 +5683,8 @@
+@@ -5778,8 +5778,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 15419fb..ccc4bf4 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
-@@ -829,8 +829,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -827,8 +827,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/expat.patch b/debian/patches/expat.patch
index 6f72505..054abda 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -17,7 +17,7 @@ Include system copy of expat.h
 --- a/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
 +++ b/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
 @@ -31,9 +31,9 @@
- #include "talk/xmpp/constants.h"
+ #include "webrtc/libjingle/xmpp/constants.h"
  #include "webrtc/base/common.h"
  #ifdef EXPAT_RELATIVE_PATH
 -#include "expat.h"
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 2da6e61..707894f 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -24,10 +24,10 @@ Include system copy of prtime.h
  
 --- a/base/time/time.cc
 +++ b/base/time/time.cc
-@@ -10,7 +10,8 @@
- #include "base/float_util.h"
+@@ -13,7 +13,8 @@
  #include "base/lazy_instance.h"
  #include "base/logging.h"
+ #include "base/strings/stringprintf.h"
 -#include "base/third_party/nspr/prtime.h"
 +
 +#include <nspr/prtime.h>
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 0115c5e..e05d6b1 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -2,7 +2,7 @@ description: use system speex
 
 --- a/build/linux/system.gyp
 +++ b/build/linux/system.gyp
-@@ -693,6 +693,26 @@
+@@ -761,6 +761,26 @@
        ],
      },
      {
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1849,7 +1849,7 @@
+@@ -1890,7 +1890,7 @@
      ['enable_web_speech==1', {
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git