[Pkg-chromium-commit] [pkg-chromium] 09/10: refresh patches
Michael Gilbert
mgilbert at alioth.debian.org
Sat Aug 24 23:58:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 55349a801e82fd85d37a8df803a317c6a89b68c7
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Aug 24 20:05:31 2013 -0400
refresh patches
---
debian/patches/arm-neon.patch | 14 +++----
debian/patches/armv4.patch | 8 ++--
.../patches/dont-assume-cross-compile-on-arm.patch | 37 -----------------
debian/patches/gold-linker.patch | 10 ++---
debian/patches/nspr.patch | 42 ++++++++++----------
debian/patches/nss.patch | 24 ++---------
debian/patches/prefs.patch | 8 ++--
debian/patches/series | 2 -
debian/patches/system-speech.patch | 24 +++++------
debian/patches/webkit-version.patch | 21 ----------
10 files changed, 57 insertions(+), 133 deletions(-)
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
index 617b9f3..245930b 100644
--- a/debian/patches/arm-neon.patch
+++ b/debian/patches/arm-neon.patch
@@ -4,10 +4,10 @@ Author: Chad Miller <chad.miller at canonical.com>
Bug-Chromium: 154107
Bug-Ubuntu: 1084852
-Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+Index: chromium/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
===================================================================
---- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-06-24 11:51:46.204041318 +0200
-+++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-06-24 11:51:46.196041318 +0200
+--- chromium.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-08-24 20:12:59.749818889 +0000
++++ chromium/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-08-24 20:12:59.745818890 +0000
@@ -72,7 +72,7 @@
'WEBRTC_LINUX',
],
@@ -17,13 +17,13 @@ Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/is
'dependencies': [ 'isac_neon', ],
'sources': [
'lattice_armv7.S',
-Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
+Index: chromium/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
===================================================================
---- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-06-24 11:51:46.204041318 +0200
-+++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-06-24 11:51:46.196041318 +0200
+--- chromium.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-08-24 20:12:59.749818889 +0000
++++ chromium/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-08-24 20:12:59.749818889 +0000
@@ -18,6 +18,47 @@
- #include "typedefs.h"
+ #include "webrtc/typedefs.h"
+#include <elf.h>
+#ifdef __arm__
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 3714f12..8589665 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,9 +1,9 @@
Do not use armv4 incopatible code
-Index: sid/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2013-06-24 11:48:31.368039228 +0200
-+++ sid/src/build/common.gypi 2013-06-24 11:48:31.364039228 +0200
-@@ -2924,6 +2924,7 @@
+--- chromium.orig/src/build/common.gypi 2013-08-24 20:10:50.661823606 +0000
++++ chromium/src/build/common.gypi 2013-08-24 20:10:50.661823606 +0000
+@@ -2961,6 +2961,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
diff --git a/debian/patches/dont-assume-cross-compile-on-arm.patch b/debian/patches/dont-assume-cross-compile-on-arm.patch
deleted file mode 100644
index f573b54..0000000
--- a/debian/patches/dont-assume-cross-compile-on-arm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/build/common.gypi b/src/build/common.gypi
-index 5312173..134f880 100644
---- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -635,31 +635,6 @@
- 'enable_settings_app%': 0,
- }],
-
-- ['OS=="linux" and target_arch=="arm" and chromeos==0', {
-- # Set some defaults for arm/linux chrome builds
-- 'linux_breakpad%': 0,
-- 'linux_use_tcmalloc%': 0,
-- # sysroot needs to be an absolute path otherwise it generates
-- # incorrect results when passed to pkg-config
-- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
-- }], # OS=="linux" and target_arch=="arm" and chromeos==0
--
-- ['linux_lsb_release=="12.04"', {
-- 'conditions': [
-- ['target_arch=="x64"', {
-- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_amd64-sysroot',
-- }],
-- ['target_arch=="ia32"', {
-- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_i386-sysroot',
-- }],
-- ],
-- }], # linux_lsb_release=="12.04"
--
-- ['target_arch=="mipsel"', {
-- 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
-- 'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc',
-- }],
--
- # Whether tests targets should be run, archived or just have the
- # dependencies verified. All the tests targets have the '_run' suffix,
- # e.g. base_unittests_run runs the target base_unittests. The test
-
diff --git a/debian/patches/gold-linker.patch b/debian/patches/gold-linker.patch
index 0249a32..cd8c88e 100644
--- a/debian/patches/gold-linker.patch
+++ b/debian/patches/gold-linker.patch
@@ -1,8 +1,8 @@
-Index: chromium-browser-28.0.1500.95/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- chromium-browser-28.0.1500.95.orig/src/build/common.gypi 2013-08-01 14:47:26.000000000 +0000
-+++ chromium-browser-28.0.1500.95/src/build/common.gypi 2013-08-01 16:37:32.571621981 +0000
-@@ -2263,6 +2263,7 @@
+--- chromium.orig/src/build/common.gypi 2013-08-24 20:13:04.853818703 +0000
++++ chromium/src/build/common.gypi 2013-08-24 20:13:04.849818703 +0000
+@@ -2286,6 +2286,7 @@
# Don't warn about printf format problems.
# This is off by default in gcc but on in Ubuntu's gcc(!).
'-Wno-format',
@@ -10,7 +10,7 @@ Index: chromium-browser-28.0.1500.95/src/build/common.gypi
],
'cflags_cc!': [
# TODO(fischman): remove this.
-@@ -2646,6 +2647,7 @@
+@@ -2675,6 +2676,7 @@
'ldflags': [
'-Wl,-z,now',
'-Wl,-z,relro',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 93e8d0e..f83e3fe 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
Include system copy of prtime.h
-Index: sid/src/base/pr_time_unittest.cc
+Index: chromium/src/base/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/pr_time_unittest.cc 2013-06-24 11:46:01.748037623 +0200
-+++ sid/src/base/pr_time_unittest.cc 2013-06-24 11:46:01.740037623 +0200
+--- chromium.orig/src/base/pr_time_unittest.cc 2013-08-24 20:06:45.077832579 +0000
++++ chromium/src/base/pr_time_unittest.cc 2013-08-24 20:06:44.985832582 +0000
@@ -5,7 +5,7 @@
#include <time.h>
@@ -12,10 +12,10 @@ Index: sid/src/base/pr_time_unittest.cc
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-Index: sid/src/base/time.cc
+Index: chromium/src/base/time.cc
===================================================================
---- sid.orig/src/base/time.cc 2013-06-24 11:46:01.748037623 +0200
-+++ sid/src/base/time.cc 2013-06-24 11:46:01.740037623 +0200
+--- chromium.orig/src/base/time.cc 2013-08-24 20:06:45.077832579 +0000
++++ chromium/src/base/time.cc 2013-08-24 20:06:45.009832582 +0000
@@ -12,7 +12,7 @@
#include <limits>
@@ -25,23 +25,23 @@ Index: sid/src/base/time.cc
#include "base/logging.h"
-Index: sid/src/chrome/browser/metrics/metrics_log.cc
+Index: chromium/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2013-06-24 11:46:01.748037623 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-06-24 11:46:01.744037623 +0200
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc 2013-08-24 20:06:45.077832579 +0000
++++ chromium/src/chrome/browser/metrics/metrics_log.cc 2013-08-24 20:06:45.009832582 +0000
@@ -20,7 +20,7 @@
- #include "base/string_util.h"
- #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time.h"
#include "base/tracked_objects.h"
- #include "base/utf_string_conversions.h"
-Index: sid/src/base/base.gypi
+ #include "chrome/browser/autocomplete/autocomplete_input.h"
+Index: chromium/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2013-06-24 11:46:01.748037623 +0200
-+++ sid/src/base/base.gypi 2013-06-24 11:46:01.744037623 +0200
+--- chromium.orig/src/base/base.gypi 2013-08-24 20:06:45.077832579 +0000
++++ chromium/src/base/base.gypi 2013-08-24 20:06:45.029832581 +0000
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -50,16 +50,16 @@ Index: sid/src/base/base.gypi
'third_party/nspr/prtime.h',
'third_party/nspr/prtypes.h',
'third_party/xdg_mime/xdgmime.h',
-Index: sid/src/chrome/common/metrics/metrics_log_base.cc
+Index: chromium/src/chrome/common/metrics/metrics_log_base.cc
===================================================================
---- sid.orig/src/chrome/common/metrics/metrics_log_base.cc 2013-06-18 09:53:32.000000000 +0200
-+++ sid/src/chrome/common/metrics/metrics_log_base.cc 2013-06-24 11:47:51.052038795 +0200
-@@ -13,7 +13,7 @@
- #include "base/strings/string_number_conversions.h"
+--- chromium.orig/src/chrome/common/metrics/metrics_log_base.cc 2013-08-24 20:06:45.077832579 +0000
++++ chromium/src/chrome/common/metrics/metrics_log_base.cc 2013-08-24 20:07:00.265832024 +0000
+@@ -14,7 +14,7 @@
+ #include "base/strings/utf_string_conversions.h"
#include "base/sys_byteorder.h"
#include "base/sys_info.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
- #include "base/utf_string_conversions.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/logging_chrome.h"
+ #include "chrome/common/metrics/proto/histogram_event.pb.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 579001c..26486d9 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: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
===================================================================
---- sid.orig/src/chrome/chrome_common.gypi 2013-06-29 17:15:15.753983583 +0200
-+++ sid/src/chrome/chrome_common.gypi 2013-06-29 17:15:15.745983583 +0200
-@@ -514,6 +514,11 @@
+--- chromium.orig/src/chrome/chrome_common.gypi 2013-08-24 20:10:40.793823967 +0000
++++ chromium/src/chrome/chrome_common.gypi 2013-08-24 20:10:40.777823967 +0000
+@@ -540,6 +540,11 @@
'common/crash_keys.h',
],
}],
@@ -15,19 +15,3 @@ Index: sid/src/chrome/chrome_common.gypi
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
-Index: sid/src/net/third_party/nss/ssl/bodge/secitem_array.c
-===================================================================
---- sid.orig/src/net/third_party/nss/ssl/bodge/secitem_array.c 2013-06-18 09:52:14.000000000 +0200
-+++ sid/src/net/third_party/nss/ssl/bodge/secitem_array.c 2013-06-29 17:16:04.153985017 +0200
-@@ -13,11 +13,6 @@
-
- typedef struct SECItemArrayStr SECItemArray;
-
--struct SECItemArrayStr {
-- SECItem *items;
-- unsigned int len;
--};
--
- SECItemArray *
- SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
- {
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 21a6fb8..1c3ec52 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,10 +1,10 @@
Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: sid/src/chrome/browser/first_run/first_run_linux.cc
+Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-06-24 11:48:28.200039194 +0200
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc 2013-06-24 11:48:28.196039194 +0200
-@@ -65,9 +65,7 @@
+--- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-08-24 20:10:46.793823747 +0000
++++ chromium/src/chrome/browser/first_run/first_run_linux.cc 2013-08-24 20:10:46.789823747 +0000
+@@ -33,9 +33,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
diff --git a/debian/patches/series b/debian/patches/series
index 5f99ee5..47bcd3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ armv4.patch
system-speech.patch
#glew.patch
fix-manpage.patch
-webkit-version.patch
#ffmpeg.patch
#vpx.patch
#protobuf.patch
@@ -19,4 +18,3 @@ arm.patch
icon.patch
arm-neon.patch
gold-linker.patch
-dont-assume-cross-compile-on-arm.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 53cb7b8..1786058 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2013-06-24 11:48:34.768039264 +0200
-+++ sid/src/build/linux/system.gyp 2013-06-24 11:48:34.760039264 +0200
-@@ -636,6 +636,26 @@
+--- chromium.orig/src/build/linux/system.gyp 2013-08-24 20:10:54.517823465 +0000
++++ chromium/src/build/linux/system.gyp 2013-08-24 20:10:54.481823466 +0000
+@@ -629,6 +629,26 @@
],
},
{
@@ -30,12 +30,12 @@ Index: sid/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc 2013-06-24 11:48:34.768039264 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2013-06-24 11:48:34.764039264 +0200
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc 2013-08-24 20:10:54.517823465 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc 2013-08-24 20:10:54.501823466 +0000
@@ -11,7 +11,7 @@
- #include "base/string_number_conversions.h"
+ #include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
#include "third_party/flac/include/FLAC/stream_encoder.h"
-#include "third_party/speex/include/speex/speex.h"
@@ -43,11 +43,11 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
namespace content {
namespace {
-Index: sid/src/content/content_browser.gypi
+Index: chromium/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2013-06-24 11:48:34.768039264 +0200
-+++ sid/src/content/content_browser.gypi 2013-06-24 11:48:34.764039264 +0200
-@@ -1342,7 +1342,7 @@
+--- chromium.orig/src/content/content_browser.gypi 2013-08-24 20:10:54.517823465 +0000
++++ chromium/src/content/content_browser.gypi 2013-08-24 20:10:54.517823465 +0000
+@@ -1443,7 +1443,7 @@
}, { # input_speech==1
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
deleted file mode 100644
index 3bc345b..0000000
--- a/debian/patches/webkit-version.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-description: debian-specific version parsing (for about dialog)
-Index: sid/src/webkit/build/webkit_version.py
-===================================================================
---- sid.orig/src/webkit/build/webkit_version.py 2013-06-24 11:48:39.708039317 +0200
-+++ sid/src/webkit/build/webkit_version.py 2013-06-24 11:48:39.700039317 +0200
-@@ -31,6 +31,15 @@
- default_lastchange=None,
- directory=webkit_src_dir,
- directory_regex_prior_to_src_url='webkit')
-+ if version_info.url is None or version_info.url == 'unknown':
-+ # parse the DEPS file
-+ data = open("../../DEPS", "rb").read()
-+ x = re.search(r'"webkit_revision": "(\d+)",', data)
-+ rev = x.group(1) if x else "n-a"
-+ x = re.search(r'"webkit_trunk": "(.*?)",', data)
-+ branch = os.path.basename(x.group(1)) if x else "n-a"
-+ return "%s@%s" % (branch, rev)
-+
-
- if version_info.url == None:
- version_info.url = 'Unknown URL'
--
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