[Pkg-chromium-commit] [pkg-chromium] 01/04: Refreshed Patches for version 30
Michael Gilbert
mgilbert at alioth.debian.org
Sun Oct 27 02:25:38 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 d16c028deb67aa386e843966369ab119607d51d3
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Sat Oct 12 16:36:06 2013 +0200
Refreshed Patches for version 30
---
debian/patches/arm-neon.patch | 12 +++---
debian/patches/arm.patch | 4 +-
debian/patches/armv4.patch | 8 ++--
debian/patches/expat.patch | 20 +++++-----
debian/patches/fix-manpage.patch | 4 +-
debian/patches/icon.patch | 6 +--
debian/patches/nspr.patch | 75 +++++++++++++++---------------------
debian/patches/nss.patch | 12 +++---
debian/patches/prefs.patch | 8 ++--
debian/patches/system-speech.patch | 22 +++++------
10 files changed, 79 insertions(+), 92 deletions(-)
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
index 245930b..04e8853 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: chromium/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
===================================================================
---- 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
+--- 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',
],
@@ -17,10 +17,10 @@ Index: chromium/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/sour
'dependencies': [ 'isac_neon', ],
'sources': [
'lattice_armv7.S',
-Index: chromium/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
+Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
===================================================================
---- 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
+--- 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"
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index f2aca1b..b23de5b 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,7 +1,7 @@
Index: sid/src/ui/base/resource/data_pack.cc
===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2013-06-24 11:51:04.360040869 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2013-06-24 11:51:04.352040869 +0200
+--- 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.
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 8589665..c8d5582 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,9 +1,9 @@
Do not use armv4 incopatible code
-Index: chromium/src/build/common.gypi
+Index: sid/src/build/common.gypi
===================================================================
---- 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 @@
+--- 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',
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 3c3c7a7..a34b47d 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -1,8 +1,8 @@
Include system copy of expat.h
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-06-24 11:48:25.644039166 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-06-24 11:48:25.636039166 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-10-12 16:30:51.162607105 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-10-12 16:30:51.154611105 +0200
@@ -32,9 +32,9 @@
#include "talk/xmllite/xmlnsstack.h"
@@ -17,8 +17,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
struct XML_ParserStruct;
Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-06-24 11:48:25.644039166 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-06-24 11:48:25.640039166 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-10-12 16:30:51.162607105 +0200
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-10-12 16:30:51.154611105 +0200
@@ -31,9 +31,9 @@
#include "talk/base/common.h"
#include "talk/xmpp/constants.h"
@@ -33,8 +33,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
namespace buzz {
Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-06-24 11:48:25.644039166 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-06-24 11:48:25.640039166 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-10-12 16:30:51.162607105 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-10-12 16:30:51.154611105 +0200
@@ -11,7 +11,7 @@
#include "SkString.h"
#include "SkStream.h"
@@ -46,8 +46,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
#define CHAR_16_TO_9
Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-06-24 11:48:25.644039166 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-06-24 11:48:25.640039166 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-10-12 16:30:51.162607105 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-10-12 16:30:51.154611105 +0200
@@ -12,7 +12,7 @@
#include "SkString.h"
#include "SkStream.h"
@@ -59,8 +59,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
{
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-06-24 11:48:25.644039166 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-06-24 11:48:25.640039166 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-10-12 16:30:51.162607105 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-10-12 16:30:51.154611105 +0200
@@ -33,11 +33,7 @@
#include "talk/base/scoped_ptr.h"
#include "talk/xmllite/xmlparser.h"
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 2444679..634108a 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -6,8 +6,8 @@ Last-Update: 2011-02-20
Index: sid/src/chrome/app/resources/manpage.1.in
===================================================================
---- sid.orig/src/chrome/app/resources/manpage.1.in 2013-06-24 11:48:37.340039292 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in 2013-06-24 11:48:37.336039292 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2013-10-12 16:35:02.358312823 +0200
++++ sid/src/chrome/app/resources/manpage.1.in 2013-10-12 16:35:02.350312823 +0200
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 9868967..4fb1737 100644
--- a/debian/patches/icon.patch
+++ b/debian/patches/icon.patch
@@ -1,8 +1,8 @@
Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-06-24 11:51:43.528041289 +0200
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-06-24 11:51:43.520041289 +0200
-@@ -54,7 +54,7 @@
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-10-12 16:35:07.302312837 +0200
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-10-12 16:35:07.298312837 +0200
+@@ -55,7 +55,7 @@
#if defined(GOOGLE_CHROME_BUILD)
static const char* kIconName = "google-chrome";
#else
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index f83e3fe..c148af7 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,47 +1,21 @@
Include system copy of prtime.h
-Index: chromium/src/base/pr_time_unittest.cc
+Index: sid/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- 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>
-
- #include "base/compiler_specific.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/time.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-Index: chromium/src/base/time.cc
-===================================================================
---- 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>
-
- #include "base/strings/sys_string_conversions.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
-
- #include "base/logging.h"
-
-Index: chromium/src/chrome/browser/metrics/metrics_log.cc
-===================================================================
---- 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 @@
+--- 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
+@@ -21,7 +21,7 @@
#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/time/time.h"
#include "base/tracked_objects.h"
#include "chrome/browser/autocomplete/autocomplete_input.h"
-Index: chromium/src/base/base.gypi
+Index: sid/src/base/base.gypi
===================================================================
---- 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
+--- 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
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -50,16 +24,29 @@ Index: chromium/src/base/base.gypi
'third_party/nspr/prtime.h',
'third_party/nspr/prtypes.h',
'third_party/xdg_mime/xdgmime.h',
-Index: chromium/src/chrome/common/metrics/metrics_log_base.cc
+Index: sid/src/base/time/pr_time_unittest.cc
===================================================================
---- 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"
+--- 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
+@@ -5,7 +5,7 @@
+ #include <time.h>
+
+ #include "base/compiler_specific.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <nspr/prtime.h>
+ #include "base/time/time.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+
+Index: sid/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 @@
+ #include "base/float_util.h"
+ #include "base/logging.h"
+ #include "base/strings/sys_string_conversions.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
- #include "chrome/common/chrome_version_info.h"
- #include "chrome/common/logging_chrome.h"
- #include "chrome/common/metrics/proto/histogram_event.pb.h"
+
+ namespace base {
+
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 26486d9..74c69d0 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,11 +1,11 @@
webkit needs to call nss to pull in nspr headers
-Index: chromium/src/chrome/chrome_common.gypi
+Index: sid/src/chrome/chrome_common.gypi
===================================================================
---- 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',
- ],
+--- 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',
+ ]
}],
+ ['OS=="linux"', {
+ 'include_dirs': [
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 1c3ec52..93d0c4b 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: chromium/src/chrome/browser/first_run/first_run_linux.cc
+Index: sid/src/chrome/browser/first_run/first_run_internal_linux.cc
===================================================================
---- 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 @@
+--- sid.orig/src/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-12 10:34:48.000000000 +0200
++++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-12 16:34:34.294312743 +0200
+@@ -19,9 +19,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 1786058..e6577ef 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
+Index: sid/src/build/linux/system.gyp
===================================================================
---- 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 @@
+--- 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 @@
],
},
{
@@ -30,10 +30,10 @@ Index: chromium/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: chromium/src/content/browser/speech/audio_encoder.cc
+Index: sid/src/content/browser/speech/audio_encoder.cc
===================================================================
---- 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
+--- 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
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -43,11 +43,11 @@ Index: chromium/src/content/browser/speech/audio_encoder.cc
namespace content {
namespace {
-Index: chromium/src/content/content_browser.gypi
+Index: sid/src/content/content_browser.gypi
===================================================================
---- 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 @@
+--- 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 @@
}, { # 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