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

Sat Oct 11 01:42:21 UTC 2014

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

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

commit b6c4858cd3210f096ad7a9ea8e5b69e533119061
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Fri Oct 10 21:40:09 2014 -0400

    refresh patches for chromium 38
---
 debian/patches/clang.patch                              | 2 +-
 debian/patches/expat.patch                              | 4 ++--
 debian/patches/linker-flags.patch                       | 2 +-
 debian/patches/no-promo.patch                           | 2 +-
 debian/patches/no-sse2.patch                            | 2 +-
 debian/patches/system-speech.patch                      | 8 ++++----
 debian/patches/third-party-cookies-off-by-default.patch | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 9cdd25c..f4f7c13 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
-@@ -5385,8 +5385,8 @@
+@@ -5547,8 +5547,8 @@
      ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
          'and OS!="win"', {
        'make_global_settings': [
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 34f7c75..6f72505 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -17,8 +17,8 @@ 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/base/common.h"
  #include "talk/xmpp/constants.h"
+ #include "webrtc/base/common.h"
  #ifdef EXPAT_RELATIVE_PATH
 -#include "expat.h"
 +#include <expat.h>
@@ -31,8 +31,8 @@ Include system copy of expat.h
 --- a/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
 +++ b/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
 @@ -33,11 +33,7 @@
- #include "talk/base/scoped_ptr.h"
  #include "talk/xmllite/xmlparser.h"
+ #include "webrtc/base/scoped_ptr.h"
  
 -#ifdef EXPAT_RELATIVE_PATH
 -#include "expat.h"
diff --git a/debian/patches/linker-flags.patch b/debian/patches/linker-flags.patch
index da75b43..952a64d 100644
--- a/debian/patches/linker-flags.patch
+++ b/debian/patches/linker-flags.patch
@@ -2,7 +2,7 @@ description: flags to avoid memory exhaustion while linking on i386
 
 --- a/build/common.gypi
 +++ b/build/common.gypi
-@@ -3287,6 +3287,8 @@
+@@ -3401,6 +3401,8 @@
          'ldflags': [
            '-Wl,-z,now',
            '-Wl,-z,relro',
diff --git a/debian/patches/no-promo.patch b/debian/patches/no-promo.patch
index e7bb77a..4f11493 100644
--- a/debian/patches/no-promo.patch
+++ b/debian/patches/no-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
-@@ -102,7 +102,7 @@ void AppListService::RegisterPrefs(PrefR
+@@ -153,7 +153,7 @@ void AppListService::RegisterPrefs(PrefR
    // Identifies whether we should show the app launcher promo or not.
    // Note that a field trial also controls the showing, so the promo won't show
    // unless the pref is set AND the field trial is set to a proper group.
diff --git a/debian/patches/no-sse2.patch b/debian/patches/no-sse2.patch
index 1e59bdb..76b2f9b 100644
--- a/debian/patches/no-sse2.patch
+++ b/debian/patches/no-sse2.patch
@@ -4,7 +4,7 @@ debian-bug: http://bugs.debian.org/750361
 
 --- a/build/common.gypi
 +++ b/build/common.gypi
-@@ -3538,8 +3538,6 @@
+@@ -3655,8 +3655,6 @@
                  # http://crbug.com/313032 for an example where this has "bit"
                  # us in the past.
                  'cflags': [
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 3a6f55f..6dec91c 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
-@@ -641,6 +641,26 @@
+@@ -649,6 +649,26 @@
        ],
      },
      {
@@ -42,12 +42,12 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1750,7 +1750,7 @@
-     ['input_speech==1', {
+@@ -1837,7 +1837,7 @@
+     ['enable_web_speech==1', {
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',
 -        '../third_party/speex/speex.gyp:libspeex',
 +        '../build/linux/system.gyp:speex',
        ],
      }],
-     ['OS == "win"', {
+     ['enable_web_speech==0 and OS=="android"', {
diff --git a/debian/patches/third-party-cookies-off-by-default.patch b/debian/patches/third-party-cookies-off-by-default.patch
index 413fad3..756d73b 100644
--- a/debian/patches/third-party-cookies-off-by-default.patch
+++ b/debian/patches/third-party-cookies-off-by-default.patch
@@ -1,9 +1,9 @@
 Description: Make default of third-party cookies the most secure for users.
 Author: Chad Miller <chad.miller at canonical.com>
 
---- a/chrome/browser/content_settings/cookie_settings.cc	2014-03-14 17:20:09.640905837 +0100
-+++ b/chrome/browser/content_settings/cookie_settings.cc	2014-03-14 17:20:09.636905837 +0100
-@@ -70,7 +70,7 @@
+--- a/chrome/browser/content_settings/cookie_settings.cc
++++ b/chrome/browser/content_settings/cookie_settings.cc
+@@ -68,7 +68,7 @@ void CookieSettings::Factory::RegisterPr
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kBlockThirdPartyCookies,

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

