[Pkg-chromium-commit] [pkg-chromium] 01/02: update patches for chromium 43

[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 1dda8a33650e47eff4d094f760cdf4a5cfc06f10
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Thu May 21 04:33:23 2015 +0000

    update patches for chromium 43
---
 debian/patches/clang.patch           |  2 +-
 debian/patches/disable/promo.patch   |  8 ++++----
 debian/patches/manpage.patch         |  2 +-
 debian/patches/missing-include.patch | 10 ----------
 debian/patches/nspr.patch            |  2 +-
 debian/patches/series                |  1 -
 debian/patches/system-speech.patch   |  4 ++--
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index 9bf03d7..4e1378e 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
-@@ -5754,8 +5754,8 @@
+@@ -5772,8 +5772,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/promo.patch b/debian/patches/disable/promo.patch
index 2e04571..eb5931f 100644
--- a/debian/patches/disable/promo.patch
+++ b/debian/patches/disable/promo.patch
@@ -4,10 +4,10 @@ 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
-@@ -154,7 +154,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.
+@@ -152,7 +152,7 @@ void AppListService::RegisterPrefs(PrefR
+ 
+   // Identifies whether we should show the app launcher promo or not. This
+   // becomes false when the user dismisses the promo.
 -  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
 +  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
  }
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index 3282065..796cdd3 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
-@@ -127,7 +127,7 @@
+@@ -136,7 +136,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/missing-include.patch b/debian/patches/missing-include.patch
deleted file mode 100644
index 73082c7..0000000
--- a/debian/patches/missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/media/cast/logging/encoding_event_subscriber.cc
-+++ b/media/cast/logging/encoding_event_subscriber.cc
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <cstring>
- #include <utility>
-+#include <algorithm>
- 
- #include "base/logging.h"
- #include "media/cast/logging/proto/proto_utils.h"
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 6acd6d2..f4b5af1 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
-@@ -598,8 +598,6 @@
+@@ -597,8 +597,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 a7f5005..2ced643 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@ system-speech.patch
 ps-print.patch
 chromedriver-revision.patch
 
-missing-include.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 25bdd01..e977e62 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
-@@ -879,6 +879,26 @@
+@@ -904,6 +904,26 @@
        ],
      },
      {
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1935,7 +1935,7 @@
+@@ -1987,7 +1987,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