[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/16.0.912.75_r116452-1-1-gb9c1859
Giuseppe Iuculano
iuculano at debian.org
Wed Jan 11 22:55:07 UTC 2012
The following commit has been merged in the experimental branch:
commit 52996447375d727291c7db74815da550a0cb37f8
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Tue Dec 13 08:39:05 2011 +0100
Update patches for v16
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index a35ea25..3635fc5 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -12,17 +12,17 @@ Do not use armv4 incopatible code
SkASSERT((int16_t)y == y);
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
-@@ -1503,6 +1503,7 @@
+@@ -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', {
+ ['arm_thumb==1', {
--- a/src/base/debug/debugger_posix.cc
+++ b/src/base/debug/debugger_posix.cc
-@@ -187,7 +187,7 @@ bool BeingDebugged() {
+@@ -189,7 +189,7 @@ bool BeingDebugged() {
} while (0)
#else
// ARM && !ANDROID
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 42bee80..cd85f73 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -60,3 +60,18 @@ Include system copy of expat.h
static inline char* dupstr(SkChunkAlloc& chunk, const char src[], size_t len)
{
+--- a/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
++++ b/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
+@@ -33,11 +33,7 @@
+ #include "talk/base/scoped_ptr.h"
+ #include "talk/xmllite/xmlparser.h"
+
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif // EXPAT_RELATIVE_PATH
++#include <expat.h>
+
+ namespace buzz {
+
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 35506e3..9df83ee 100644
--- a/debian/patches/glew.patch
+++ b/debian/patches/glew.patch
@@ -1,6 +1,6 @@
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -428,6 +428,23 @@
+@@ -468,6 +468,23 @@
},
},
{
@@ -23,10 +23,10 @@
+ {
# TODO(satorux): Remove this once dbus-glib clients are gone.
'target_name': 'dbus-glib',
- 'type': 'settings',
+ 'type': 'none',
--- 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',
@@ -36,7 +36,7 @@
'utility/chrome_content_utility_client.cc',
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
-@@ -875,6 +875,7 @@
+@@ -1064,6 +1064,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 6401192..2c5624d 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -34,7 +34,7 @@ Include system copy of prtime.h
#include "chrome/browser/autocomplete/autocomplete.h"
--- 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"
@@ -43,3 +43,35 @@ Include system copy of prtime.h
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/logging_chrome.h"
+--- a/src/base/base.gypi
++++ b/src/base/base.gypi
+@@ -18,7 +18,6 @@
+ 'third_party/dynamic_annotations/dynamic_annotations.h',
+ 'third_party/icu/icu_utf.cc',
+ 'third_party/icu/icu_utf.h',
+- 'third_party/nspr/prtime.cc',
+ 'third_party/nspr/prtime.h',
+ 'third_party/nspr/prcpucfg_linux.h',
+ 'third_party/xdg_mime/xdgmime.h',
+--- a/src/crypto/nss_util.cc
++++ b/src/crypto/nss_util.cc
+@@ -9,7 +9,7 @@
+ #include <plarena.h>
+ #include <prerror.h>
+ #include <prinit.h>
+-#include <prtime.h>
++#include <nspr/prtime.h>
+ #include <pk11pub.h>
+ #include <secmod.h>
+
+--- a/src/net/base/x509_certificate_nss.cc
++++ b/src/net/base/x509_certificate_nss.cc
+@@ -9,7 +9,7 @@
+ #include <nss.h>
+ #include <pk11pub.h>
+ #include <prerror.h>
+-#include <prtime.h>
++#include <nspr/prtime.h>
+ #include <secder.h>
+ #include <secerr.h>
+ #include <sechash.h>
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 9ef0335..750095e 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,15 +1,15 @@
webkit needs to call nss to pull in nspr headers
--- 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..553503e 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -8,11 +8,11 @@ Tell Chromium to look in /etc/chromium for the master_preferences file
- 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;
+ break;
+ }
--- 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(
MasterPrefs* out_prefs) {
DCHECK(!user_data_dir.empty());
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 2670a5e..b457694 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,8 +1,8 @@
Use system speex
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -319,6 +319,26 @@
- }]]
+@@ -359,6 +359,26 @@
+ ],
},
{
+ 'target_name': 'speex',
@@ -26,7 +26,7 @@ Use system speex
+ },
+ {
'target_name': 'gnome_keyring',
- 'type': 'settings',
+ 'type': 'none',
'conditions': [
--- a/src/content/browser/speech/audio_encoder.cc
+++ b/src/content/browser/speech/audio_encoder.cc
@@ -41,12 +41,12 @@ Use system speex
--- 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',
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list