[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/16.0.912.75_r116452-1-3-g625083e
Jonathan Nieder
jrnieder at gmail.com
Thu Jan 26 09:51:46 UTC 2012
The following commit has been merged in the experimental branch:
commit 70fc5ec4d6067981bfeb7947bf100cda74657019
Author: Jonathan Nieder <jrnieder at gmail.com>
Date: Tue Dec 6 07:13:46 2011 -0600
Refresh patches and add descriptions
Descriptions are based on the revision history.
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index a35ea25..0374200 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,4 +1,47 @@
-Do not use armv4 incopatible code
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 17 Jul 2010 17:17:42 +0200
+Subject: Do not use armv4-incompatible code
+
+Fixes http://bugs.debian.org/584946
+Fixes http://bugs.debian.org/611725
+Fixes http://code.google.com/p/skia/issues/detail?id=160
+
+Reported-by: Timo Juhani Lindfors <timo.lindfors at iki.fi>
+Improved-by: Jérémy Lal <jerry at edagames.com>
+---
+ src/base/debug/debugger_posix.cc | 2 +-
+ src/build/common.gypi | 1 +
+ src/third_party/skia/include/core/SkMath.h | 2 +-
+ .../skia/src/opts/SkBlitRow_opts_arm.cpp | 6 +++---
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/base/debug/debugger_posix.cc b/src/base/debug/debugger_posix.cc
+index 8b4c8f12..3fcca9fe 100644
+--- a/src/base/debug/debugger_posix.cc
++++ b/src/base/debug/debugger_posix.cc
+@@ -189,7 +189,7 @@ bool BeingDebugged() {
+ } while (0)
+ #else
+ // ARM && !ANDROID
+-#define DEBUG_BREAK() asm("bkpt 0")
++#define DEBUG_BREAK() asm("nop")
+ #endif
+ #else
+ #define DEBUG_BREAK() asm("int3")
+diff --git a/src/build/common.gypi b/src/build/common.gypi
+index 108a5356..8f83b57c 100644
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -1753,6 +1753,7 @@
+ # silences those warnings, as they are not helpful and
+ # clutter legitimate warnings.
+ '-Wno-abi',
++ '-fno-tree-sink',
+ ],
+ 'conditions': [
+ ['arm_thumb==1', {
+diff --git a/src/third_party/skia/include/core/SkMath.h b/src/third_party/skia/include/core/SkMath.h
+index 58891036..9cbbec68 100644
--- a/src/third_party/skia/include/core/SkMath.h
+++ b/src/third_party/skia/include/core/SkMath.h
@@ -156,7 +156,7 @@ static inline bool SkIsPow2(int value) {
@@ -10,30 +53,11 @@ Do not use armv4 incopatible code
static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
SkASSERT((int16_t)x == x);
SkASSERT((int16_t)y == y);
---- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -1503,6 +1503,7 @@
- # silences those warnings, as they are not helpful and
- # clutter legitimate warnings.
- '-Wno-abi',
-+ '-fno-tree-sink',
- ],
- 'conditions': [
- ['arm_thumb == 1', {
---- a/src/base/debug/debugger_posix.cc
-+++ b/src/base/debug/debugger_posix.cc
-@@ -187,7 +187,7 @@ bool BeingDebugged() {
- } while (0)
- #else
- // ARM && !ANDROID
--#define DEBUG_BREAK() asm("bkpt 0")
-+#define DEBUG_BREAK() asm("nop")
- #endif
- #else
- #define DEBUG_BREAK() asm("int3")
+diff --git a/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp b/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
+index 393af3c1..92951387 100644
--- a/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
-@@ -675,8 +675,8 @@ static void S32A_Blend_BlitRow32_arm(SkP
+@@ -675,8 +675,8 @@ static void S32A_Blend_BlitRow32_arm(SkPMColor* SK_RESTRICT dst,
/* dst1_scale and dst2_scale*/
"lsr r9, r5, #24 \n\t" /* src >> 24 */
"lsr r10, r6, #24 \n\t" /* src >> 24 */
@@ -44,7 +68,7 @@ Do not use armv4 incopatible code
"lsr r9, r9, #8 \n\t" /* r9 >> 8 */
"lsr r10, r10, #8 \n\t" /* r10 >> 8 */
"rsb r9, r9, #256 \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
-@@ -745,7 +745,7 @@ static void S32A_Blend_BlitRow32_arm(SkP
+@@ -745,7 +745,7 @@ static void S32A_Blend_BlitRow32_arm(SkPMColor* SK_RESTRICT dst,
"lsr r6, r5, #24 \n\t" /* src >> 24 */
"and r8, r12, r5, lsr #8 \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index 0628faf..33b52a8 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -1,15 +1,13 @@
-Description: Fix build failure due to cups 1.5 header changes
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
---- a/src/printing/backend/cups_helper.h
-+++ b/src/printing/backend/cups_helper.h
-@@ -7,6 +7,7 @@
- #pragma once
-
- #include <cups/cups.h>
-+#include <cups/ppd.h>
-
- #include "printing/printing_export.h"
-
+From: Michael Gilbert <michael.s.gilbert at gmail.com>
+Date: Thu, 18 Aug 2011 17:45:23 -0400
+Subject: Fix build failure with cups >= 1.5.0
+---
+ .../service/cloud_print/print_system_cups.cc | 1 +
+ src/printing/backend/cups_helper.h | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/chrome/service/cloud_print/print_system_cups.cc b/src/chrome/service/cloud_print/print_system_cups.cc
+index 54ee38fc..cdddac0d 100644
--- a/src/chrome/service/cloud_print/print_system_cups.cc
+++ b/src/chrome/service/cloud_print/print_system_cups.cc
@@ -5,6 +5,7 @@
@@ -20,3 +18,15 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>
+diff --git a/src/printing/backend/cups_helper.h b/src/printing/backend/cups_helper.h
+index ee1de9a0..388919d8 100644
+--- a/src/printing/backend/cups_helper.h
++++ b/src/printing/backend/cups_helper.h
+@@ -7,6 +7,7 @@
+ #pragma once
+
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+
+ #include "printing/printing_export.h"
+
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 42bee80..da8d2fd 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -1,4 +1,16 @@
-Include system copy of expat.h
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 8 May 2010 19:29:40 +0200
+Subject: Include system copy of expat.h
+---
+ src/chrome/browser/autofill/autofill_xml_parser.h | 2 +-
+ .../libjingle/source/talk/xmllite/xmlparser.h | 4 ++--
+ .../libjingle/source/talk/xmpp/xmppstanzaparser.cc | 4 ++--
+ .../skia/src/ports/SkXMLParser_expat.cpp | 2 +-
+ .../skia/src/ports/SkXMLPullParser_expat.cpp | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/chrome/browser/autofill/autofill_xml_parser.h b/src/chrome/browser/autofill/autofill_xml_parser.h
+index f25e31a9..95cf059c 100644
--- a/src/chrome/browser/autofill/autofill_xml_parser.h
+++ b/src/chrome/browser/autofill/autofill_xml_parser.h
@@ -12,7 +12,7 @@
@@ -10,6 +22,8 @@ Include system copy of expat.h
#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
// The base class that contains common functionality between
+diff --git a/src/third_party/libjingle/source/talk/xmllite/xmlparser.h b/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
+index b461e7e4..935896c6 100644
--- a/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
+++ b/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
@@ -32,9 +32,9 @@
@@ -24,6 +38,8 @@ Include system copy of expat.h
#endif // EXPAT_RELATIVE_PATH
struct XML_ParserStruct;
+diff --git a/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc b/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+index 6c3ef5fe..766d26e0 100644
--- a/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+++ b/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
@@ -31,9 +31,9 @@
@@ -38,6 +54,8 @@ Include system copy of expat.h
#endif
namespace buzz {
+diff --git a/src/third_party/skia/src/ports/SkXMLParser_expat.cpp b/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
+index c78dc350..7a8147f3 100644
--- a/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
@@ -11,7 +11,7 @@
@@ -49,6 +67,8 @@ Include system copy of expat.h
#ifdef SK_BUILD_FOR_PPI
#define CHAR_16_TO_9
+diff --git a/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp b/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
+index 06cdc653..41051eb5 100644
--- a/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
@@ -12,7 +12,7 @@
diff --git a/debian/patches/ffmpeg_arm.patch b/debian/patches/ffmpeg_arm.patch
index da15737..83a0323 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,3 +1,13 @@
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 3 Jul 2010 13:16:40 +0200
+Subject: Disable ARMv6, ARMv7, V5TE, VFP code in internal copy of ffmpeg
+---
+ .../ffmpeg/config/Chrome/linux/arm/config.h | 8 ++++----
+ src/third_party/ffmpeg/ffmpeg_generated.gypi | 7 -------
+ 2 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h b/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
+index e225e1d6..e04005fe 100644
--- a/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
+++ b/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
@@ -34,10 +34,10 @@
@@ -15,6 +25,8 @@
#define HAVE_AVX 0
#define HAVE_IWMMXT 0
#define HAVE_MMI 0
+diff --git a/src/third_party/ffmpeg/ffmpeg_generated.gypi b/src/third_party/ffmpeg/ffmpeg_generated.gypi
+index c2aa3c28..37c2ec56 100644
--- a/src/third_party/ffmpeg/ffmpeg_generated.gypi
+++ b/src/third_party/ffmpeg/ffmpeg_generated.gypi
@@ -155,21 +155,14 @@
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 563bbf2..1879810 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -1,9 +1,24 @@
-Description: Removed warning in help option.
-Forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
-Author: Daniel Echeverry <epsilon77 at gmail.com>
-Origin: vendor
-Last-Update: 2011-02-20
+From: Daniel Echeverry <epsilon77 at gmail.com>
+Date: Sun, 20 Feb 2011 14:04:21 -0500
+Subject: Remove warning on --help
+"chromium-browser --help" produces the following output:
+
+ chromium-browser.1:99: warning [p 2, 5.3i]: cannot adjust line
+
+Add a paragraph break to the manpage so the usage string can be viewed
+without a warning.
+
+Fixes http://crbug.com/73591
+Fixes http://bugs.debian.org/607503
+
+Reported-by: shirish शिरीष <shirishag75 at gmail.com>
+---
+ src/chrome/app/resources/manpage.1.in | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/chrome/app/resources/manpage.1.in b/src/chrome/app/resources/manpage.1.in
+index 695cc1f2..15377b92 100644
--- a/src/chrome/app/resources/manpage.1.in
+++ b/src/chrome/app/resources/manpage.1.in
@@ -1,5 +1,5 @@
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 35506e3..209066c 100644
--- a/debian/patches/glew.patch
+++ b/debian/patches/glew.patch
@@ -1,6 +1,29 @@
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sun, 13 Jun 2010 14:29:11 +0200
+Subject: Use system copy of libglewmx
+---
+ src/build/common.gypi | 1 +
+ src/build/linux/system.gyp | 17 +++++++++++++++++
+ src/chrome/chrome.gyp | 1 +
+ 3 files changed, 19 insertions(+), 0 deletions(-)
+
+diff --git a/src/build/common.gypi b/src/build/common.gypi
+index 8f83b57c..35b6b641 100644
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -1064,6 +1064,7 @@
+ ['enable_gpu==1', {
+ 'defines': [
+ 'ENABLE_GPU=1',
++ 'GLEW_MX',
+ ],
+ }],
+ ['use_openssl==1', {
+diff --git a/src/build/linux/system.gyp b/src/build/linux/system.gyp
+index 779816c0..0b5dee53 100644
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -428,6 +428,23 @@
+@@ -468,6 +468,23 @@
},
},
{
@@ -23,10 +46,12 @@
+ {
# TODO(satorux): Remove this once dbus-glib clients are gone.
'target_name': 'dbus-glib',
- 'type': 'settings',
+ 'type': 'none',
+diff --git a/src/chrome/chrome.gyp b/src/chrome/chrome.gyp
+index 19014090..2d87e661 100644
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
-@@ -472,6 +472,7 @@
+@@ -460,6 +460,7 @@
'../base/base.gyp:base',
'../content/content.gyp:content_utility',
'../skia/skia.gyp:skia',
@@ -34,13 +59,3 @@
],
'sources': [
'utility/chrome_content_utility_client.cc',
---- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -875,6 +875,7 @@
- ['enable_gpu==1', {
- 'defines': [
- 'ENABLE_GPU=1',
-+ 'GLEW_MX',
- ],
- }],
- ['use_openssl==1', {
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 6401192..0820557 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,4 +1,15 @@
-Include system copy of prtime.h
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 8 May 2010 11:30:40 +0200
+Subject: Include system copy of prtime.h
+---
+ src/base/pr_time_unittest.cc | 2 +-
+ src/base/time.cc | 2 +-
+ src/chrome/browser/metrics/metrics_log.cc | 2 +-
+ src/chrome/common/metrics_helpers.cc | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/base/pr_time_unittest.cc b/src/base/pr_time_unittest.cc
+index 5c8bad1d..8a9697de 100644
--- a/src/base/pr_time_unittest.cc
+++ b/src/base/pr_time_unittest.cc
@@ -4,7 +4,7 @@
@@ -10,6 +21,8 @@ Include system copy of prtime.h
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
+diff --git a/src/base/time.cc b/src/base/time.cc
+index 859810e7..996c33dc 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -4,7 +4,7 @@
@@ -21,6 +34,8 @@ Include system copy of prtime.h
#include "base/logging.h"
+diff --git a/src/chrome/browser/metrics/metrics_log.cc b/src/chrome/browser/metrics/metrics_log.cc
+index d0bffb0d..3702c326 100644
--- a/src/chrome/browser/metrics/metrics_log.cc
+++ b/src/chrome/browser/metrics/metrics_log.cc
@@ -13,7 +13,7 @@
@@ -32,9 +47,11 @@ Include system copy of prtime.h
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
+diff --git a/src/chrome/common/metrics_helpers.cc b/src/chrome/common/metrics_helpers.cc
+index 599bf12a..ea993a0c 100644
--- a/src/chrome/common/metrics_helpers.cc
+++ b/src/chrome/common/metrics_helpers.cc
-@@ -17,7 +17,7 @@
+@@ -11,7 +11,7 @@
#include "base/perftimer.h"
#include "base/string_number_conversions.h"
#include "base/sys_info.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 9ef0335..e0775bf 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,15 +1,23 @@
-webkit needs to call nss to pull in nspr headers
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 8 May 2010 12:05:46 +0200
+Subject: Pull in nspr headers
+---
+ src/chrome/chrome_common.gypi | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/chrome/chrome_common.gypi b/src/chrome/chrome_common.gypi
+index 1e0a23e5..062713b6 100644
--- a/src/chrome/chrome_common.gypi
+++ b/src/chrome/chrome_common.gypi
-@@ -18,6 +18,11 @@
- '<(DEPTH)/third_party/wtl/include',
- ],
- }],
-+ ['OS=="linux"', {
-+ 'include_dirs': [
-+ '/usr/include/nspr',
-+ ],
-+ }],
- ],
- 'sources': [
- # .cc, .h, and .mm files under chrome/common that are used on all
+@@ -237,6 +237,11 @@
+ '<(DEPTH)/third_party/wtl/include',
+ ],
+ }],
++ ['OS=="linux"', {
++ 'include_dirs': [
++ '/usr/include/nspr',
++ ],
++ }],
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index cd177a9..5d649de 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,18 +1,18 @@
-Tell Chromium to look in /etc/chromium for the master_preferences file
---- a/src/chrome/common/chrome_paths.cc
-+++ b/src/chrome/common/chrome_paths.cc
-@@ -303,7 +303,7 @@ bool PathProvider(int key, FilePath* res
- #if defined(GOOGLE_CHROME_BUILD)
- cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
- #else
-- cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
-+ cur = FilePath(FILE_PATH_LITERAL("/etc/chromium-browser/master_preferences"));
- #endif
- if (!file_util::PathExists(cur)) // we don't want to create this
- return false;
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Wed, 26 Oct 2011 09:54:36 +0200
+Subject: Tell Chromium to look in /etc/chromium-browser for the master_preferences file
+
+... instead of next to the chromium binary.
+---
+ src/chrome/browser/first_run/first_run.cc | 2 +-
+ src/chrome/common/chrome_paths.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/chrome/browser/first_run/first_run.cc b/src/chrome/browser/first_run/first_run.cc
+index a1ce8314..18d4a478 100644
--- a/src/chrome/browser/first_run/first_run.cc
+++ b/src/chrome/browser/first_run/first_run.cc
-@@ -150,7 +150,7 @@ bool FirstRun::ProcessMasterPreferences(
+@@ -151,7 +151,7 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
MasterPrefs* out_prefs) {
DCHECK(!user_data_dir.empty());
@@ -21,3 +21,16 @@ Tell Chromium to look in /etc/chromium for the master_preferences file
if (master_prefs.empty())
return true;
installer::MasterPreferences prefs(master_prefs);
+diff --git a/src/chrome/common/chrome_paths.cc b/src/chrome/common/chrome_paths.cc
+index cfd60587..56cc7d87 100644
+--- a/src/chrome/common/chrome_paths.cc
++++ b/src/chrome/common/chrome_paths.cc
+@@ -303,7 +303,7 @@ bool PathProvider(int key, FilePath* result) {
+ #if defined(GOOGLE_CHROME_BUILD)
+ cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+ #else
+- cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
++ cur = FilePath(FILE_PATH_LITERAL("/etc/chromium-browser/master_preferences"));
+ #endif
+ break;
+ }
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 2670a5e..5c9108d 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,8 +1,18 @@
-Use system speex
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Fri Oct 1 18:14:08 2010 +0200
+Subject: Use system speex
+---
+ src/build/linux/system.gyp | 20 ++++++++++++++++++++
+ src/content/browser/speech/audio_encoder.cc | 2 +-
+ src/content/content_browser.gypi | 2 +-
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/src/build/linux/system.gyp b/src/build/linux/system.gyp
+index e8e3287e..779816c0 100644
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -319,6 +319,26 @@
- }]]
+@@ -359,6 +359,26 @@
+ ],
},
{
+ 'target_name': 'speex',
@@ -26,8 +36,10 @@ Use system speex
+ },
+ {
'target_name': 'gnome_keyring',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
+diff --git a/src/content/browser/speech/audio_encoder.cc b/src/content/browser/speech/audio_encoder.cc
+index 683ec0e3..0d44a80b 100644
--- a/src/content/browser/speech/audio_encoder.cc
+++ b/src/content/browser/speech/audio_encoder.cc
@@ -10,7 +10,7 @@
@@ -39,14 +51,16 @@ Use system speex
using std::string;
+diff --git a/src/content/content_browser.gypi b/src/content/content_browser.gypi
+index 7ab16fea..253a54e2 100644
--- a/src/content/content_browser.gypi
+++ b/src/content/content_browser.gypi
-@@ -17,7 +17,7 @@
- '../third_party/flac/flac.gyp:libflac',
- # TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
- '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-- '../third_party/speex/speex.gyp:libspeex',
-+ '../build/linux/system.gyp:speex',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../third_party/zlib/zlib.gyp:zlib',
- '../ui/ui.gyp:ui',
+@@ -12,7 +12,7 @@
+ '../third_party/flac/flac.gyp:libflac',
+ # TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+- '../third_party/speex/speex.gyp:libspeex',
++ '../build/linux/system.gyp:speex',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../ui/ui.gyp:ui',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 4a3ed00..86d7894 100644
--- a/debian/patches/webkit-version.patch
+++ b/debian/patches/webkit-version.patch
@@ -1,6 +1,20 @@
+From: Fabien Tassin <fta at ubuntu.com>
+Date: Fri, 25 Feb 2011 10:41:53 +0100
+Subject: Fix the Webkit version in about:version
+
+The build system expects the svn or git directories to be available at
+build time.
+
+Patch from Ubuntu, thanks to Fabien Tassin
+---
+ src/webkit/build/webkit_version.py | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/src/webkit/build/webkit_version.py b/src/webkit/build/webkit_version.py
+index 7fdf9b32..b8c1af57 100755
--- a/src/webkit/build/webkit_version.py
+++ b/src/webkit/build/webkit_version.py
-@@ -60,6 +60,15 @@ def GetWebKitRevision(webkit_dir, versio
+@@ -60,6 +60,15 @@ def GetWebKitRevision(webkit_dir, version_file):
default_lastchange=None,
directory=os.path.join(webkit_dir, version_file_dir),
directory_regex_prior_to_src_url='webkit')
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list