[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chrome 31
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Nov 24 01:09:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to tag debian/31.0.1650.57-1_deb7u1
in repository pkg-chromium.
commit 6f29732a3a1403e0a3c3e11e7a5088e85f8dd28c
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Nov 16 23:14:57 2013 +0000
refresh patches for chrome 31
---
debian/patches/arm-neon.patch | 71 --------------------------------------
debian/patches/arm.patch | 17 ---------
debian/patches/armv4.patch | 13 -------
debian/patches/gcc4.7.patch | 38 ++++++++++----------
debian/patches/nspr.patch | 32 +++++++++--------
debian/patches/nss.patch | 10 +++---
debian/patches/series | 3 --
debian/patches/system-speech.patch | 22 ++++++------
8 files changed, 52 insertions(+), 154 deletions(-)
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
deleted file mode 100644
index 04e8853..0000000
--- a/debian/patches/arm-neon.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: GYP assumes ARMv7 always wants NEON, even if compile flags disable.
-Origin: http://code.google.com/p/chromium/issues/detail?id=154107
-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
-===================================================================
---- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-10-12 16:35:09.654312844 +0200
-+++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-10-12 16:35:09.650312844 +0200
-@@ -72,7 +72,7 @@
- 'WEBRTC_LINUX',
- ],
- }],
-- ['target_arch=="arm" and armv7==1', {
-+ ['target_arch=="arm" and armv7==1 and arm_neon==1', {
- 'dependencies': [ 'isac_neon', ],
- 'sources': [
- 'lattice_armv7.S',
-Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
-===================================================================
---- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-10-12 16:35:09.654312844 +0200
-+++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-10-12 16:35:09.650312844 +0200
-@@ -18,6 +18,47 @@
-
- #include "webrtc/typedefs.h"
-
-+#include <elf.h>
-+#ifdef __arm__
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <linux/auxvec.h>
-+#include <asm/hwcap.h>
-+#endif
-+
-+#ifdef __arm__
-+uint64_t WebRtc_GetCPUFeaturesARM() {
-+ static bool detected = false;
-+ static uint64_t have_neon = 0;
-+
-+ int fd;
-+ Elf32_auxv_t auxv;
-+ unsigned int hwcaps;
-+
-+ if (!detected) {
-+ int fd;
-+ Elf32_auxv_t auxv;
-+ unsigned int hwcaps;
-+
-+ fd = open("/proc/self/auxv", O_RDONLY);
-+ if (fd >= 0) {
-+ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
-+ if (auxv.a_type == AT_HWCAP) {
-+ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
-+ break;
-+ }
-+ }
-+ close (fd);
-+ } else {
-+ have_neon = 0;
-+ }
-+ detected = true;
-+ }
-+
-+ return 0 | have_neon; // others here as we need them
-+}
-+#endif
-+
- // No CPU feature is available => straight C path.
- int GetCPUInfoNoASM(CPUFeature feature) {
- (void)feature;
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
deleted file mode 100644
index b23de5b..0000000
--- a/debian/patches/arm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: sid/src/ui/base/resource/data_pack.cc
-===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2013-10-12 16:35:04.850312830 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2013-10-12 16:35:04.846312830 +0200
-@@ -147,9 +147,11 @@
- // 2) Verify the entries are within the appropriate bounds. There's an extra
- // entry after the last item which gives us the length of the last item.
- for (size_t i = 0; i < resource_count_ + 1; ++i) {
-+ uint32 t;
- const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
- mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
-- if (entry->file_offset > mmap_->length()) {
-+ memcpy(&t, &entry->file_offset, 32/8);
-+ if (t > mmap_->length()) {
- LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
- << "Was the file corrupted?";
- UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
deleted file mode 100644
index c8d5582..0000000
--- a/debian/patches/armv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Do not use armv4 incopatible code
-Index: sid/src/build/common.gypi
-===================================================================
---- sid.orig/src/build/common.gypi 2013-10-12 16:34:55.630312804 +0200
-+++ sid/src/build/common.gypi 2013-10-12 16:34:55.626312804 +0200
-@@ -3026,6 +3026,7 @@
- # silences those warnings, as they are not helpful and
- # clutter legitimate warnings.
- '-Wno-abi',
-+ '-fno-tree-sink',
- ],
- 'conditions': [
- ['arm_arch!=""', {
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
index 72f8fe7..5333314 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,7 +1,7 @@
Index: chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h
===================================================================
---- chromium.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-08-25 00:40:18.157232879 +0000
-+++ chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-08-25 01:18:50.073148406 +0000
+--- chromium.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-11-16 23:32:53.511987888 +0000
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
@@ -12,8 +12,8 @@ Index: chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.
#include "chrome/browser/search_engines/search_engine_type.h"
Index: chromium/src/gpu/command_buffer/common/types.h
===================================================================
---- chromium.orig/src/gpu/command_buffer/common/types.h 2013-08-25 00:40:38.053232152 +0000
-+++ chromium/src/gpu/command_buffer/common/types.h 2013-08-25 01:18:50.077148406 +0000
+--- chromium.orig/src/gpu/command_buffer/common/types.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/gpu/command_buffer/common/types.h 2013-11-16 23:32:53.511987888 +0000
@@ -12,6 +12,7 @@
#endif
#include <cstddef>
@@ -24,8 +24,8 @@ Index: chromium/src/gpu/command_buffer/common/types.h
typedef signed char int8;
Index: chromium/src/ipc/ipc_channel.h
===================================================================
---- chromium.orig/src/ipc/ipc_channel.h 2013-08-25 00:41:29.573230269 +0000
-+++ chromium/src/ipc/ipc_channel.h 2013-08-25 01:18:50.077148406 +0000
+--- chromium.orig/src/ipc/ipc_channel.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/ipc/ipc_channel.h 2013-11-16 23:32:53.511987888 +0000
@@ -1,3 +1,4 @@
+#include <sys/types.h>
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -33,8 +33,8 @@ Index: chromium/src/ipc/ipc_channel.h
// found in the LICENSE file.
Index: chromium/src/third_party/ots/src/os2.cc
===================================================================
---- chromium.orig/src/third_party/ots/src/os2.cc 2013-08-25 00:41:08.129231053 +0000
-+++ chromium/src/third_party/ots/src/os2.cc 2013-08-25 01:18:50.085148406 +0000
+--- chromium.orig/src/third_party/ots/src/os2.cc 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/third_party/ots/src/os2.cc 2013-11-16 23:32:53.511987888 +0000
@@ -5,6 +5,7 @@
#include "os2.h"
@@ -45,8 +45,8 @@ Index: chromium/src/third_party/ots/src/os2.cc
// http://www.microsoft.com/opentype/otspec/os2.htm
Index: chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
===================================================================
---- chromium.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-08-25 00:40:40.973232045 +0000
-+++ chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-08-25 01:18:50.097148405 +0000
+--- chromium.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-11-16 23:32:53.511987888 +0000
@@ -39,6 +39,7 @@
#include <stddef.h> // for ptrdiff_t
@@ -57,8 +57,8 @@ Index: chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
Index: chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
===================================================================
---- chromium.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-08-25 00:40:40.973232045 +0000
-+++ chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-08-25 01:18:50.097148405 +0000
+--- chromium.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-11-16 23:32:53.511987888 +0000
@@ -63,6 +63,7 @@
#define HAVE_VDSO_SUPPORT 1
@@ -69,8 +69,8 @@ Index: chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
namespace base {
Index: chromium/src/third_party/tcmalloc/chromium/src/common.cc
===================================================================
---- chromium.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-08-25 00:40:40.913232047 +0000
-+++ chromium/src/third_party/tcmalloc/chromium/src/common.cc 2013-08-25 01:18:50.101148405 +0000
+--- chromium.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/third_party/tcmalloc/chromium/src/common.cc 2013-11-16 23:32:53.515987888 +0000
@@ -33,6 +33,7 @@
#include "config.h"
#include "common.h"
@@ -81,8 +81,8 @@ Index: chromium/src/third_party/tcmalloc/chromium/src/common.cc
#include <unistd.h> // for getpagesize
Index: chromium/src/third_party/tcmalloc/chromium/src/symbolize.h
===================================================================
---- chromium.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-08-25 00:40:40.933232047 +0000
-+++ chromium/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-08-25 01:18:50.105148405 +0000
+--- chromium.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-11-16 23:32:53.515987888 +0000
@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
@@ -93,13 +93,13 @@ Index: chromium/src/third_party/tcmalloc/chromium/src/symbolize.h
Index: chromium/src/ui/gfx/codec/jpeg_codec.h
===================================================================
---- chromium.orig/src/ui/gfx/codec/jpeg_codec.h 2013-08-25 00:40:37.317232179 +0000
-+++ chromium/src/ui/gfx/codec/jpeg_codec.h 2013-08-25 01:18:50.109148405 +0000
+--- chromium.orig/src/ui/gfx/codec/jpeg_codec.h 2013-11-16 23:32:24.587987959 +0000
++++ chromium/src/ui/gfx/codec/jpeg_codec.h 2013-11-16 23:32:53.515987888 +0000
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <vector>
+#include <cstddef>
- #include "ui/base/ui_export.h"
+ #include "ui/gfx/gfx_export.h"
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index c148af7..e3a33fc 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,21 +1,21 @@
Include system copy of prtime.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-10-12 16:27:35.488492546 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-10-12 16:29:00.749840789 +0200
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/chrome/browser/metrics/metrics_log.cc 2013-11-13 07:52:01.556672167 +0000
@@ -21,7 +21,7 @@
- #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
+ #include "base/test/perftimer.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time/time.h"
#include "base/tracked_objects.h"
#include "chrome/browser/autocomplete/autocomplete_input.h"
-Index: sid/src/base/base.gypi
+Index: chromium/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2013-10-12 16:27:35.488492546 +0200
-+++ sid/src/base/base.gypi 2013-10-12 16:27:35.484494546 +0200
+--- chromium.orig/src/base/base.gypi 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/base.gypi 2013-11-13 07:50:26.928675625 +0000
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -24,10 +24,10 @@ 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/base/time/pr_time_unittest.cc
+Index: chromium/src/base/time/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/time/pr_time_unittest.cc 2013-10-12 10:33:49.000000000 +0200
-+++ sid/src/base/time/pr_time_unittest.cc 2013-10-12 16:29:39.378516904 +0200
+--- chromium.orig/src/base/time/pr_time_unittest.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/time/pr_time_unittest.cc 2013-11-13 07:50:26.928675625 +0000
@@ -5,7 +5,7 @@
#include <time.h>
@@ -37,16 +37,18 @@ Index: sid/src/base/time/pr_time_unittest.cc
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-Index: sid/src/base/time/time.cc
+Index: chromium/src/base/time/time.cc
===================================================================
---- sid.orig/src/base/time/time.cc 2013-10-12 10:33:49.000000000 +0200
-+++ sid/src/base/time/time.cc 2013-10-12 16:30:11.562416992 +0200
-@@ -10,7 +10,7 @@
+--- chromium.orig/src/base/time/time.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/time/time.cc 2013-11-13 07:51:53.344672467 +0000
+@@ -9,8 +9,8 @@
+
#include "base/float_util.h"
#include "base/logging.h"
- #include "base/strings/sys_string_conversions.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 74c69d0..795be34 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,10 +1,10 @@
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-10-12 16:30:47.608385096 +0200
-+++ sid/src/chrome/chrome_common.gypi 2013-10-12 16:30:47.600389094 +0200
-@@ -607,6 +607,11 @@
- 'common/local_discovery/service_discovery_client.h',
+--- chromium.orig/src/chrome/chrome_common.gypi 2013-11-13 07:52:09.572671874 +0000
++++ chromium/src/chrome/chrome_common.gypi 2013-11-13 07:52:09.572671874 +0000
+@@ -606,6 +606,11 @@
+ 'common/local_discovery/local_discovery_messages.h',
]
}],
+ ['OS=="linux"', {
diff --git a/debian/patches/series b/debian/patches/series
index 4bcc10e..2991c21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ nspr.patch
nss.patch
expat.patch
prefs.patch
-armv4.patch
#ffmpeg_arm.patch
system-speech.patch
#glew.patch
@@ -18,6 +17,4 @@ cups1.5.patch
#system_v8.patch
#protobuf.patch
gcc4.7.patch
-arm.patch
icon.patch
-arm-neon.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index e6577ef..d819cc7 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-10-12 16:34:59.322312814 +0200
-+++ sid/src/build/linux/system.gyp 2013-10-12 16:34:59.314312814 +0200
-@@ -635,6 +635,26 @@
+--- chromium.orig/src/build/linux/system.gyp 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/build/linux/system.gyp 2013-11-13 07:52:17.676671578 +0000
+@@ -699,6 +699,26 @@
],
},
{
@@ -30,10 +30,10 @@ 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-10-12 16:34:59.322312814 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2013-10-12 16:34:59.314312814 +0200
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc 2013-11-13 07:52:17.676671578 +0000
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.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-10-12 16:34:59.322312814 +0200
-+++ sid/src/content/content_browser.gypi 2013-10-12 16:34:59.314312814 +0200
-@@ -1505,7 +1505,7 @@
+--- chromium.orig/src/content/content_browser.gypi 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/content/content_browser.gypi 2013-11-13 07:52:17.684671578 +0000
+@@ -1555,7 +1555,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