[Pkg-chromium-commit] [pkg-chromium] 01/03: refresh patches for chromium 35
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun May 25 18:45:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch wheezy
in repository pkg-chromium.
commit c227dc774ca9ea792d63ee6af82d70cf6ab80be2
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun May 25 00:58:29 2014 -0400
refresh patches for chromium 35
Conflicts:
debian/patches/gold-linker.patch
debian/patches/no-promo.patch
debian/patches/series
---
debian/patches/make-support/gyp.patch | 17 +++++++++
debian/patches/make-support/mojo.patch | 64 ++++++++++++++++++++++++++++++++++
debian/patches/make-support/opus.patch | 12 +++++++
debian/patches/nspr.patch | 34 +++++++++---------
debian/patches/nss.patch | 6 ++--
debian/patches/series | 5 ++-
debian/patches/system-speech.patch | 16 ++++-----
7 files changed, 125 insertions(+), 29 deletions(-)
diff --git a/debian/patches/make-support/gyp.patch b/debian/patches/make-support/gyp.patch
new file mode 100644
index 0000000..6350de0
--- /dev/null
+++ b/debian/patches/make-support/gyp.patch
@@ -0,0 +1,17 @@
+description: restore support for building with make rather than ninja
+
+--- a/src/build/gyp_chromium
++++ a/src/build/gyp_chromium
+@@ -246,12 +246,6 @@ if __name__ == '__main__':
+ if sys.platform not in ('darwin',):
+ args.append('--no-circular-check')
+
+- # We explicitly don't support the make gyp generator (crbug.com/348686). Be
+- # nice and fail here, rather than choking in gyp.
+- if 'make' in os.environ.get('GYP_GENERATORS', ''):
+- print 'Error: make gyp generator not supported (check GYP_GENERATORS).'
+- sys.exit(1)
+-
+ # Default to ninja on linux and windows, but only if no generator has
+ # explicitly been set.
+ # Also default to ninja on mac, but only when not building chrome/ios.
diff --git a/debian/patches/make-support/mojo.patch b/debian/patches/make-support/mojo.patch
new file mode 100644
index 0000000..f158aa1
--- /dev/null
+++ b/debian/patches/make-support/mojo.patch
@@ -0,0 +1,64 @@
+description: manually strip out mojo since use_mojo=0 by itself isn't enough
+
+--- a/src/build/all.gyp
++++ b/src/build/all.gyp
+@@ -79,7 +79,6 @@
+ '../jingle/jingle.gyp:*',
+ '../media/cast/cast.gyp:*',
+ '../media/media.gyp:*',
+- '../mojo/mojo.gyp:*',
+ '../ppapi/ppapi.gyp:*',
+ '../ppapi/ppapi_internal.gyp:*',
+ '../ppapi/tools/ppapi_tools.gyp:*',
+@@ -283,7 +282,6 @@
+ '../jingle/jingle.gyp:jingle_unittests',
+ '../media/cast/cast.gyp:cast_unittests',
+ '../media/media.gyp:media_unittests',
+- '../mojo/mojo.gyp:mojo',
+ '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+ '../remoting/remoting.gyp:remoting_unittests',
+ '../third_party/WebKit/public/all.gyp:all_blink',
+--- a/src/content/content.gyp
++++ b/src/content/content.gyp
+@@ -22,11 +22,6 @@
+ ],
+ },
+ 'conditions': [
+- ['use_mojo==1', {
+- 'includes': [
+- 'content_common_mojo_bindings.gypi',
+- ],
+- }],
+ ['OS != "ios"', {
+ 'includes': [
+ '../build/win_precompile.gypi',
+--- a/src/content/content_tests.gypi
++++ b/src/content/content_tests.gypi
+@@ -923,27 +923,6 @@
+ ],
+ },
+ {
+- 'target_name': 'web_ui_test_mojo_bindings',
+- 'type': 'static_library',
+- 'dependencies': [
+- '../mojo/mojo.gyp:mojo_bindings',
+- '../mojo/mojo.gyp:mojo_system',
+- ],
+- 'sources': [
+- 'test/data/web_ui_test_mojo_bindings.mojom',
+- ],
+- # TODO(sky): this shouldn't be necessary. It's working around a bug in
+- # gyp.
+- 'variables': {
+- 'mojom_base_output_dir': 'content',
+- },
+- 'includes': [ '../mojo/public/bindings/mojom_bindings_generator.gypi' ],
+- 'export_dependent_settings': [
+- '../mojo/mojo.gyp:mojo_bindings',
+- '../mojo/mojo.gyp:mojo_system',
+- ],
+- },
+- {
+ 'target_name': 'content_browsertests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
diff --git a/debian/patches/make-support/opus.patch b/debian/patches/make-support/opus.patch
new file mode 100644
index 0000000..8390e4a
--- /dev/null
+++ b/debian/patches/make-support/opus.patch
@@ -0,0 +1,12 @@
+description: # gets interpreted as a comment, leading to compile errors (not a documented gcc option anyway)
+
+--- a/src/third_party/opus/opus.gyp
++++ b/src/third_party/opus/opus.gyp
+@@ -54,7 +54,6 @@
+ 'cflags': [
+ # Suppress a warning given by opus_decoder.c that tells us
+ # optimizations are turned off.
+- '-Wno-#pragma-messages',
+ ],
+ }],
+ ['use_opus_fixed_point==0', {
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 8671fb7..4e374b1 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
Include system copy of prtime.h
Index: chromium/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- chromium.orig/src/chrome/browser/metrics/metrics_log.cc 2014-04-11 01:42:59.284279752 +0000
-+++ chromium/src/chrome/browser/metrics/metrics_log.cc 2014-04-11 01:42:59.252279753 +0000
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc
++++ chromium/src/chrome/browser/metrics/metrics_log.cc
@@ -22,7 +22,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -14,20 +14,21 @@ Index: chromium/src/chrome/browser/metrics/metrics_log.cc
#include "chrome/browser/autocomplete/autocomplete_input.h"
Index: chromium/src/base/base.gypi
===================================================================
---- chromium.orig/src/base/base.gypi 2014-04-11 01:42:59.284279752 +0000
-+++ chromium/src/base/base.gypi 2014-04-11 01:42:59.252279753 +0000
-@@ -26,7 +26,6 @@
- 'third_party/nspr/prcpucfg_openbsd.h',
- 'third_party/nspr/prcpucfg_solaris.h',
- 'third_party/nspr/prcpucfg_win.h',
+--- chromium.orig/src/base/base.gypi
++++ chromium/src/base/base.gypi
+@@ -18,8 +18,6 @@
+ 'third_party/dmg_fp/dtoa_wrapper.cc',
+ 'third_party/icu/icu_utf.cc',
+ 'third_party/icu/icu_utf.h',
- 'third_party/nspr/prtime.cc',
- 'third_party/nspr/prtime.h',
- 'third_party/nspr/prtypes.h',
+- 'third_party/nspr/prtime.h',
+ 'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h',
+ 'allocator/allocator_extension.cc',
Index: chromium/src/base/time/pr_time_unittest.cc
===================================================================
---- chromium.orig/src/base/time/pr_time_unittest.cc 2014-04-11 01:42:59.284279752 +0000
-+++ chromium/src/base/time/pr_time_unittest.cc 2014-04-11 01:42:59.252279753 +0000
+--- chromium.orig/src/base/time/pr_time_unittest.cc
++++ chromium/src/base/time/pr_time_unittest.cc
@@ -5,7 +5,7 @@
#include <time.h>
@@ -39,16 +40,15 @@ Index: chromium/src/base/time/pr_time_unittest.cc
Index: chromium/src/base/time/time.cc
===================================================================
---- chromium.orig/src/base/time/time.cc 2014-04-11 01:42:59.284279752 +0000
-+++ chromium/src/base/time/time.cc 2014-04-11 01:42:59.252279753 +0000
-@@ -10,8 +10,8 @@
+--- chromium.orig/src/base/time/time.cc
++++ chromium/src/base/time/time.cc
+@@ -10,7 +10,8 @@
#include "base/float_util.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/third_party/nspr/prtime.h"
--#include "base/third_party/nspr/prtypes.h"
++
+#include <nspr/prtime.h>
-+#include <nspr/prtypes.h>
namespace base {
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index d2491c4..5be138b 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,9 +1,9 @@
webkit needs to call nss to pull in nspr headers
Index: chromium/src/chrome/chrome_common.gypi
===================================================================
---- chromium.orig/src/chrome/chrome_common.gypi 2014-04-11 01:43:04.164279626 +0000
-+++ chromium/src/chrome/chrome_common.gypi 2014-04-11 01:43:04.164279626 +0000
-@@ -492,6 +492,11 @@
+--- chromium.orig/src/chrome/chrome_common.gypi
++++ chromium/src/chrome/chrome_common.gypi
+@@ -483,6 +483,11 @@
'common/local_discovery/local_discovery_messages.h',
]
}],
diff --git a/debian/patches/series b/debian/patches/series
index b86b00c..6a2c825 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,7 @@ cups1.5.patch
#protobuf.patch
gcc4.7.patch
icon.patch
-disable-gn.patch
+
+make-support/gyp.patch
+make-support/mojo.patch
+make-support/opus.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 090a24f..75bec0f 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
Use system speex
Index: chromium/src/build/linux/system.gyp
===================================================================
---- chromium.orig/src/build/linux/system.gyp 2014-04-11 01:43:12.108279422 +0000
-+++ chromium/src/build/linux/system.gyp 2014-04-11 01:43:12.104279422 +0000
-@@ -332,6 +332,26 @@
+--- chromium.orig/src/build/linux/system.gyp
++++ chromium/src/build/linux/system.gyp
+@@ -585,6 +585,26 @@
],
},
{
@@ -32,8 +32,8 @@ Index: chromium/src/build/linux/system.gyp
'conditions': [
Index: chromium/src/content/browser/speech/audio_encoder.cc
===================================================================
---- chromium.orig/src/content/browser/speech/audio_encoder.cc 2014-04-11 01:43:12.108279422 +0000
-+++ chromium/src/content/browser/speech/audio_encoder.cc 2014-04-11 01:43:12.104279422 +0000
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc
++++ chromium/src/content/browser/speech/audio_encoder.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -45,9 +45,9 @@ Index: chromium/src/content/browser/speech/audio_encoder.cc
namespace {
Index: chromium/src/content/content_browser.gypi
===================================================================
---- chromium.orig/src/content/content_browser.gypi 2014-04-11 01:43:12.108279422 +0000
-+++ chromium/src/content/content_browser.gypi 2014-04-11 01:43:12.104279422 +0000
-@@ -1639,7 +1639,7 @@
+--- chromium.orig/src/content/content_browser.gypi
++++ chromium/src/content/content_browser.gypi
+@@ -1729,7 +1729,7 @@
}, { # input_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
More information about the Pkg-chromium-commit
mailing list