[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches
Michael Gilbert
mgilbert at alioth.debian.org
Sun Aug 25 04:32:02 UTC 2013
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch wheezy
in repository pkg-chromium.
commit 88202986d95fa9aa2f914d0cee17fdbc64e63941
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Aug 25 01:19:30 2013 +0000
refresh patches
---
debian/patches/arm-neon.patch | 14 ++++-----
debian/patches/armv4.patch | 8 ++---
debian/patches/gcc4.7.patch | 56 +++++++++++++++++------------------
debian/patches/nspr.patch | 42 +++++++++++++-------------
debian/patches/nss.patch | 8 ++---
debian/patches/prefs.patch | 8 ++---
debian/patches/series | 1 -
debian/patches/system-speech.patch | 24 +++++++--------
debian/patches/webkit-version.patch | 21 -------------
9 files changed, 80 insertions(+), 102 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/gcc4.7.patch b/debian/patches/gcc4.7.patch
index 518ae26..72f8fe7 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,19 +1,19 @@
-Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
+Index: chromium/src/chrome/browser/search_engines/template_url_prepopulate_data.h
===================================================================
---- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-06-24 11:50:52.936040746 +0200
+--- 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
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
#include <vector>
+#include <cstddef>
- #include "base/string16.h"
+ #include "base/strings/string16.h"
#include "chrome/browser/search_engines/search_engine_type.h"
-Index: sid/src/gpu/command_buffer/common/types.h
+Index: chromium/src/gpu/command_buffer/common/types.h
===================================================================
---- sid.orig/src/gpu/command_buffer/common/types.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/gpu/command_buffer/common/types.h 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -12,6 +12,7 @@
#endif
#include <cstddef>
@@ -22,19 +22,19 @@ Index: sid/src/gpu/command_buffer/common/types.h
typedef signed char schar;
typedef signed char int8;
-Index: sid/src/ipc/ipc_channel.h
+Index: chromium/src/ipc/ipc_channel.h
===================================================================
---- sid.orig/src/ipc/ipc_channel.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/ipc/ipc_channel.h 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -1,3 +1,4 @@
+#include <sys/types.h>
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-Index: sid/src/third_party/ots/src/os2.cc
+Index: chromium/src/third_party/ots/src/os2.cc
===================================================================
---- sid.orig/src/third_party/ots/src/os2.cc 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/ots/src/os2.cc 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -5,6 +5,7 @@
#include "os2.h"
@@ -43,10 +43,10 @@ Index: sid/src/third_party/ots/src/os2.cc
// OS/2 - OS/2 and Windows Metrics
// http://www.microsoft.com/opentype/otspec/os2.htm
-Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
+Index: chromium/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -39,6 +39,7 @@
#include <stddef.h> // for ptrdiff_t
@@ -55,10 +55,10 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
#include "base/logging.h"
-Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
+Index: chromium/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -63,6 +63,7 @@
#define HAVE_VDSO_SUPPORT 1
@@ -67,10 +67,10 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
#include <stdlib.h> // for NULL
namespace base {
-Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
+Index: chromium/src/third_party/tcmalloc/chromium/src/common.cc
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2013-06-24 11:50:52.940040746 +0200
+--- 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
@@ -33,6 +33,7 @@
#include "config.h"
#include "common.h"
@@ -79,10 +79,10 @@ Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
#if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE)
#include <unistd.h> // for getpagesize
-Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
+Index: chromium/src/third_party/tcmalloc/chromium/src/symbolize.h
===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-06-24 11:50:52.944040747 +0200
+--- 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
@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
@@ -91,10 +91,10 @@ Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
using std::map;
-Index: sid/src/ui/gfx/codec/jpeg_codec.h
+Index: chromium/src/ui/gfx/codec/jpeg_codec.h
===================================================================
---- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-06-24 11:50:52.944040747 +0200
+--- 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
@@ -7,6 +7,7 @@
#include <stddef.h>
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 7d8e387..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',
],
}],
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 17ceb15..4bcc10e 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
#gcc46.patch
#vpx.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