[Pkg-chromium-commit] [pkg-chromium] 02/03: refresh patches for chromium 41

[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 559a86d195e91a8e9149f5cfa3597ff7376aa2f2
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Mar 7 00:54:38 2015 -0500

    refresh patches for chromium 41
---
 debian/patches/clang.patch         |  2 +-
 debian/patches/expat.patch         | 45 --------------------------------------
 debian/patches/manpage.patch       |  2 +-
 debian/patches/ps-print.patch      |  2 +-
 debian/patches/series              |  1 -
 debian/patches/system-speech.patch |  4 ++--
 6 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
index dc2b295..f57fb17 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
-@@ -5778,8 +5778,8 @@
+@@ -5696,8 +5696,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
deleted file mode 100644
index 054abda..0000000
--- a/debian/patches/expat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Include system copy of expat.h
-
---- a/third_party/libjingle/source/talk/xmllite/xmlparser.h
-+++ b/third_party/libjingle/source/talk/xmllite/xmlparser.h
-@@ -32,9 +32,9 @@
- 
- #include "talk/xmllite/xmlnsstack.h"
- #ifdef EXPAT_RELATIVE_PATH
--#include "expat.h"
-+#include <expat.h>
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif  // EXPAT_RELATIVE_PATH
- 
- struct XML_ParserStruct;
---- a/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
-+++ b/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
-@@ -31,9 +31,9 @@
- #include "webrtc/libjingle/xmpp/constants.h"
- #include "webrtc/base/common.h"
- #ifdef EXPAT_RELATIVE_PATH
--#include "expat.h"
-+#include <expat.h>
- #else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
-+#include <expat.h>
- #endif
- 
- namespace buzz {
---- a/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
-+++ b/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
-@@ -33,11 +33,7 @@
- #include "talk/xmllite/xmlparser.h"
- #include "webrtc/base/scoped_ptr.h"
- 
--#ifdef EXPAT_RELATIVE_PATH
--#include "expat.h"
--#else
--#include "third_party/expat/v2_0_1/Source/lib/expat.h"
--#endif  // EXPAT_RELATIVE_PATH
-+#include <expat.h>
- 
- namespace buzz {
- 
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index f147802..f094262 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
-@@ -116,7 +116,7 @@
+@@ -124,7 +124,7 @@
                  }, { # else branding!="Chrome"
                    'variables': {
                      'name': 'Chromium',
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index ecb12ff..c97d70f 100644
--- a/debian/patches/ps-print.patch
+++ b/debian/patches/ps-print.patch
@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
 
 --- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
 +++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
-@@ -337,6 +337,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -343,6 +343,7 @@ void PrintDialogGtk2::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
    // TODO(thestig) Add more capabilities to support?
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
diff --git a/debian/patches/series b/debian/patches/series
index bf3a3ad..b9cf2fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ disable/promo.patch
 disable/google-api-warning.patch
 
 nspr.patch
-expat.patch
 prefs.patch
 system-speech.patch
 third-party-cookies-off-by-default.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index e05d6b1..cfec79c 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
-@@ -761,6 +761,26 @@
+@@ -879,6 +879,26 @@
        ],
      },
      {
@@ -42,7 +42,7 @@ description: use system speex
  namespace {
 --- a/content/content_browser.gypi
 +++ b/content/content_browser.gypi
-@@ -1890,7 +1890,7 @@
+@@ -1919,7 +1919,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