[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/14.0.835.202_r103287-1-4-g301651c
Giuseppe Iuculano
iuculano at debian.org
Sun Nov 6 12:59:44 UTC 2011
The following commit has been merged in the master branch:
commit 62dfe31d3cb34a88487d9ebddf4de04aa917e7f9
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Oct 26 09:54:36 2011 +0200
Refreshed patches
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 4633bf6..a35ea25 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,7 +1,7 @@
Do not use armv4 incopatible code
--- a/src/third_party/skia/include/core/SkMath.h
+++ b/src/third_party/skia/include/core/SkMath.h
-@@ -163,7 +163,7 @@ static inline bool SkIsPow2(int value) {
+@@ -156,7 +156,7 @@ static inline bool SkIsPow2(int value) {
#if defined(__arm__) \
&& !defined(__thumb__) \
&& !defined(__ARM_ARCH_4T__) \
@@ -12,7 +12,7 @@ Do not use armv4 incopatible code
SkASSERT((int16_t)y == y);
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
-@@ -1426,6 +1426,7 @@
+@@ -1503,6 +1503,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
@@ -33,7 +33,7 @@ Do not use armv4 incopatible code
#define DEBUG_BREAK() asm("int3")
--- a/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
-@@ -685,8 +685,8 @@ static void S32A_Blend_BlitRow32_arm(SkP
+@@ -675,8 +675,8 @@ static void S32A_Blend_BlitRow32_arm(SkP
/* dst1_scale and dst2_scale*/
"lsr r9, r5, #24 \n\t" /* src >> 24 */
"lsr r10, r6, #24 \n\t" /* src >> 24 */
@@ -44,7 +44,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 */
-@@ -755,7 +755,7 @@ static void S32A_Blend_BlitRow32_arm(SkP
+@@ -745,7 +745,7 @@ static void S32A_Blend_BlitRow32_arm(SkP
"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 d29f9a6..0628faf 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -8,7 +8,7 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
#include <cups/cups.h>
+#include <cups/ppd.h>
- class GURL;
+ #include "printing/printing_export.h"
--- a/src/chrome/service/cloud_print/print_system_cups.cc
+++ b/src/chrome/service/cloud_print/print_system_cups.cc
@@ -20,13 +20,3 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>
---- a/src/chrome/browser/ui/webui/print_preview_handler.cc
-+++ b/src/chrome/browser/ui/webui/print_preview_handler.cc
-@@ -46,6 +46,7 @@
-
- #if defined(USE_CUPS)
- #include <cups/cups.h>
-+#include <cups/ppd.h>
-
- #include "base/file_util.h"
- #endif
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 4bbcd2b..42bee80 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -40,7 +40,7 @@ Include system copy of expat.h
namespace buzz {
--- a/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
-@@ -19,7 +19,7 @@
+@@ -11,7 +11,7 @@
#include "SkString.h"
#include "SkStream.h"
@@ -51,7 +51,7 @@ Include system copy of expat.h
#define CHAR_16_TO_9
--- a/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
-@@ -20,7 +20,7 @@
+@@ -12,7 +12,7 @@
#include "SkString.h"
#include "SkStream.h"
diff --git a/debian/patches/ffmpeg_arm.patch b/debian/patches/ffmpeg_arm.patch
index 3c03dc2..da15737 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -15,20 +15,27 @@
#define HAVE_AVX 0
#define HAVE_IWMMXT 0
#define HAVE_MMI 0
---- a/src/third_party/ffmpeg/ffmpeg.gyp
-+++ b/src/third_party/ffmpeg/ffmpeg.gyp
-@@ -395,14 +395,10 @@
- 'patched-ffmpeg/libavcodec/arm/dsputil_arm.S',
- 'patched-ffmpeg/libavcodec/arm/dsputil_armv6.S',
- 'patched-ffmpeg/libavcodec/arm/dsputil_init_arm.c',
-- 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv5te.c',
- 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv6.c',
-- 'patched-ffmpeg/libavcodec/arm/dsputil_init_vfp.c',
-- 'patched-ffmpeg/libavcodec/arm/dsputil_vfp.S',
- 'patched-ffmpeg/libavcodec/arm/fft_fixed_init_arm.c', # jun 11
- 'patched-ffmpeg/libavcodec/arm/fft_init_arm.c',
- 'patched-ffmpeg/libavcodec/arm/fmtconvert_init_arm.c', # jun 11
-- 'patched-ffmpeg/libavcodec/arm/fmtconvert_vfp.S', # jun 11
- # BUG(ihf): Seems like a bug in ffmpeg that we need
- # h264pred_init_arm.c to enable vp8.
- 'patched-ffmpeg/libavcodec/arm/h264pred_init_arm.c',
+--- a/src/third_party/ffmpeg/ffmpeg_generated.gypi
++++ b/src/third_party/ffmpeg/ffmpeg_generated.gypi
+@@ -155,21 +155,14 @@
+ 'patched-ffmpeg/libavcodec/arm/dsputil_arm.S',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_init_arm.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv5te.c',
+ 'patched-ffmpeg/libavcodec/arm/dsputil_init_armv6.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_init_vfp.c',
+- 'patched-ffmpeg/libavcodec/arm/dsputil_vfp.S',
+ 'patched-ffmpeg/libavcodec/arm/fft_fixed_init_arm.c',
+ 'patched-ffmpeg/libavcodec/arm/fft_init_arm.c',
+ 'patched-ffmpeg/libavcodec/arm/fmtconvert_init_arm.c',
+- 'patched-ffmpeg/libavcodec/arm/fmtconvert_vfp.S',
+ 'patched-ffmpeg/libavcodec/arm/h264pred_init_arm.c',
+ 'patched-ffmpeg/libavcodec/arm/jrevdct_arm.S',
+ 'patched-ffmpeg/libavcodec/arm/mpegvideo_arm.c',
+- 'patched-ffmpeg/libavcodec/arm/mpegvideo_armv5te.c',
+- 'patched-ffmpeg/libavcodec/arm/mpegvideo_armv5te_s.S',
+ 'patched-ffmpeg/libavcodec/arm/simple_idct_arm.S',
+- 'patched-ffmpeg/libavcodec/arm/simple_idct_armv5te.S',
+ 'patched-ffmpeg/libavcodec/arm/simple_idct_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/vp8_armv6.S',
+ 'patched-ffmpeg/libavcodec/arm/vp8dsp_armv6.S',
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 5bb2c41..563bbf2 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -4,10 +4,8 @@ Author: Daniel Echeverry <epsilon77 at gmail.com>
Origin: vendor
Last-Update: 2011-02-20
-Index: chromium/src/chrome/app/resources/manpage.1.in
-===================================================================
---- chromium.orig/src/chrome/app/resources/manpage.1.in 2011-08-26 20:52:39.000000000 -0400
-+++ chromium/src/chrome/app/resources/manpage.1.in 2011-08-26 20:55:12.000000000 -0400
+--- a/src/chrome/app/resources/manpage.1.in
++++ b/src/chrome/app/resources/manpage.1.in
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
@@ -16,7 +14,7 @@ Index: chromium/src/chrome/app/resources/manpage.1.in
.TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
.SH NAME
-@@ -110,6 +110,7 @@
+@@ -110,6 +110,7 @@ as
See the GTK documentation for more:
.IP
<http://library.gnome.org/devel/gtk/stable/gtk-running.html>
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 05608f6..35506e3 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
-@@ -432,6 +432,23 @@
+@@ -428,6 +428,23 @@
},
},
{
@@ -26,7 +26,7 @@
'type': 'settings',
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
-@@ -499,6 +499,7 @@
+@@ -472,6 +472,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
-@@ -810,6 +810,7 @@
+@@ -875,6 +875,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index ea8a0b1..cd177a9 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,7 +1,7 @@
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
-@@ -325,7 +325,7 @@ bool PathProvider(int key, FilePath* res
+@@ -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
@@ -12,14 +12,12 @@ Tell Chromium to look in /etc/chromium for the master_preferences file
return false;
--- a/src/chrome/browser/first_run/first_run.cc
+++ b/src/chrome/browser/first_run/first_run.cc
-@@ -102,9 +102,7 @@ bool FirstRun::ProcessMasterPreferences(
-
- // The standard location of the master prefs is next to the chrome binary.
- FilePath master_prefs;
-- if (!PathService::Get(base::DIR_EXE, &master_prefs))
-- return true;
-- master_prefs = master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
-+ master_prefs = FilePath("/etc/chromium");
+@@ -150,7 +150,7 @@ bool FirstRun::ProcessMasterPreferences(
+ MasterPrefs* out_prefs) {
+ DCHECK(!user_data_dir.empty());
+- FilePath master_prefs = MasterPrefsPath();
++ FilePath master_prefs = FilePath("/etc/chromium");
+ if (master_prefs.empty())
+ return true;
installer::MasterPreferences prefs(master_prefs);
- if (!prefs.read_from_file())
diff --git a/debian/patches/series b/debian/patches/series
index 35bfb2f..8103bee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,5 +17,4 @@ webkit-version.patch
#icu.patch
cups1.5.patch
system_v8.patch
-system_v8_i18n.patch
#protobuf.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index cde4fe1..2670a5e 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,7 +1,7 @@
Use system speex
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -323,6 +323,26 @@
+@@ -319,6 +319,26 @@
}]]
},
{
@@ -41,10 +41,10 @@ Use system speex
--- a/src/content/content_browser.gypi
+++ b/src/content/content_browser.gypi
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
'../third_party/flac/flac.gyp:libflac',
# TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
- '../third_party/leveldb/leveldb.gyp:leveldb',
+ '../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',
diff --git a/debian/patches/system_v8.patch b/debian/patches/system_v8.patch
index 54c9faa..62fdaf7 100644
--- a/debian/patches/system_v8.patch
+++ b/debian/patches/system_v8.patch
@@ -1,7 +1,7 @@
Use system copy of libv8
--- a/src/build/linux/system.gyp
+++ b/src/build/linux/system.gyp
-@@ -343,6 +343,18 @@
+@@ -339,6 +339,18 @@
}]]
},
{
@@ -22,7 +22,7 @@ Use system copy of libv8
'conditions': [
--- a/src/net/net.gyp
+++ b/src/net/net.gyp
-@@ -690,7 +690,7 @@
+@@ -710,7 +710,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -33,7 +33,7 @@ Use system copy of libv8
['chromeos==1', {
--- a/src/build/all.gyp
+++ b/src/build/all.gyp
-@@ -57,7 +57,7 @@
+@@ -60,7 +60,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -44,8 +44,8 @@ Use system copy of libv8
['OS=="mac" or OS=="linux"', {
--- a/src/chrome/browser/browser_about_handler.cc
+++ b/src/chrome/browser/browser_about_handler.cc
-@@ -63,7 +63,7 @@
- #include "webkit/plugins/npapi/webplugininfo.h"
+@@ -64,7 +64,7 @@
+ #include "webkit/plugins/webplugininfo.h"
#ifdef CHROME_V8
-#include "v8/include/v8.h"
@@ -53,72 +53,17 @@ Use system copy of libv8
#endif
#if defined(OS_WIN)
---- a/src/chrome/browser/memory_purger.cc
-+++ b/src/chrome/browser/memory_purger.cc
-@@ -23,7 +23,7 @@
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_getter.h"
- #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- // PurgeMemoryHelper -----------------------------------------------------------
-
---- a/src/chrome/renderer/automation/dom_automation_v8_extension.h
-+++ b/src/chrome/renderer/automation/dom_automation_v8_extension.h
-@@ -6,7 +6,7 @@
- #define CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_V8_EXTENSION_H_
- #pragma once
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- class DomAutomationV8Extension {
- public:
--- a/src/chrome/renderer/extensions/bindings_utils.h
+++ b/src/chrome/renderer/extensions/bindings_utils.h
-@@ -10,7 +10,7 @@
- #include "base/memory/singleton.h"
- #include "base/string_piece.h"
- #include "ui/base/resource/resource_bundle.h"
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- #include <list>
- #include <string>
---- a/src/chrome/renderer/extensions/event_bindings.h
-+++ b/src/chrome/renderer/extensions/event_bindings.h
@@ -8,7 +8,7 @@
- #include <string>
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- class ExtensionDispatcher;
- class GURL;
---- a/src/chrome/renderer/extensions/js_only_v8_extensions.h
-+++ b/src/chrome/renderer/extensions/js_only_v8_extensions.h
-@@ -6,7 +6,7 @@
- #define CHROME_RENDERER_EXTENSIONS_JS_ONLY_V8_EXTENSIONS_H_
- #pragma once
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- // This file contains various V8 Extensions that are JavaScript only, and
- // don't have any C++ native functions.
---- a/src/chrome/renderer/extensions/renderer_extension_bindings.h
-+++ b/src/chrome/renderer/extensions/renderer_extension_bindings.h
-@@ -6,7 +6,7 @@
- #define CHROME_RENDERER_EXTENSIONS_RENDERER_EXTENSION_BINDINGS_H_
- #pragma once
-
+ #include "base/memory/linked_ptr.h"
+ #include "base/memory/singleton.h"
-#include "v8/include/v8.h"
+#include <v8.h>
- #include <string>
-
+ #include <list>
+ #include <map>
--- a/src/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/src/chrome/renderer/loadtimes_extension_bindings.cc
@@ -9,7 +9,7 @@
@@ -130,17 +75,6 @@ Use system copy of libv8
using WebKit::WebDataSource;
using WebKit::WebFrame;
---- a/src/chrome/test/v8_unit_test.h
-+++ b/src/chrome/test/v8_unit_test.h
-@@ -9,7 +9,7 @@
- #include <string>
-
- #include "testing/gtest/include/gtest/gtest.h"
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- namespace base {
- class StringPiece;
--- a/src/net/proxy/proxy_resolver_v8.cc
+++ b/src/net/proxy/proxy_resolver_v8.cc
@@ -23,7 +23,7 @@
@@ -163,28 +97,6 @@ Use system copy of libv8
namespace extensions_v8 {
---- a/src/webkit/extensions/v8/gc_extension.h
-+++ b/src/webkit/extensions/v8/gc_extension.h
-@@ -8,7 +8,7 @@
- #ifndef WEBKIT_EXTENSIONS_V8_GC_EXTENSION_H_
- #define WEBKIT_EXTENSIONS_V8_GC_EXTENSION_H_
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- namespace extensions_v8 {
-
---- a/src/webkit/extensions/v8/heap_profiler_extension.h
-+++ b/src/webkit/extensions/v8/heap_profiler_extension.h
-@@ -9,7 +9,7 @@
- #ifndef WEBKIT_EXTENSIONS_V8_HEAP_PROFILER_EXTENSION_H_
- #define WEBKIT_EXTENSIONS_V8_HEAP_PROFILER_EXTENSION_H_
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- namespace extensions_v8 {
-
--- a/src/webkit/extensions/v8/playback_extension.h
+++ b/src/webkit/extensions/v8/playback_extension.h
@@ -5,7 +5,7 @@
@@ -218,17 +130,6 @@ Use system copy of libv8
using WebKit::WebCanvas;
using WebKit::WebData;
---- a/src/webkit/glue/webkitclient_impl.cc
-+++ b/src/webkit/glue/webkitclient_impl.cc
-@@ -44,7 +44,7 @@
- #include "webkit/glue/weburlloader_impl.h"
-
- #if defined(OS_LINUX)
--#include "v8/include/v8.h"
-+#include <v8.h>
- #endif
-
- using WebKit::WebAudioBus;
--- a/src/webkit/tools/test_shell/listener_leak_test.cc
+++ b/src/webkit/tools/test_shell/listener_leak_test.cc
@@ -8,8 +8,8 @@
@@ -266,12 +167,16 @@ Use system copy of libv8
using WebKit::WebView;
--- a/src/webkit/glue/webkit_glue.gypi
+++ b/src/webkit/glue/webkit_glue.gypi
-@@ -502,11 +502,11 @@
- ['inside_chromium_build==1 and component=="shared_library"', {
- 'dependencies': [
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-+ '<(DEPTH)/build/linux/system.gyp:v8',
+@@ -115,7 +115,7 @@
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
++ '<(DEPTH)/build/linux/system.gyp:v8',
+ 'webkit_resources',
+ 'webkit_strings',
+ 'webkit_user_agent',
+@@ -509,7 +509,7 @@
],
'export_dependent_settings': [
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -293,18 +198,18 @@ Use system copy of libv8
using WebKit::WebScriptSource;
--- a/src/v8/tools/gyp/v8.gyp
+++ b/src/v8/tools/gyp/v8.gyp
-@@ -964,7 +964,7 @@
- 'type': 'executable',
- 'toolsets': ['host'],
+@@ -832,7 +832,7 @@
+ }],
+ ],
'dependencies': [
- 'v8'
+ '../../../build/linux/system.gyp:v8',
],
- 'sources': [
- '../../samples/shell.cc',
+ },
+ ],
--- a/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
+++ b/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
-@@ -972,7 +972,7 @@
+@@ -995,7 +995,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -313,7 +218,7 @@ Use system copy of libv8
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-@@ -1086,10 +1086,10 @@
+@@ -1113,10 +1113,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -326,16 +231,7 @@ Use system copy of libv8
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-@@ -1754,7 +1754,7 @@
- }],
- ['javascript_engine=="v8"', {
- 'dependencies': [
-- '<(chromium_src_dir)/v8/src/extensions/experimental/experimental.gyp:i18n_api',
-+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
- ],
- }],
- ],
-@@ -1801,10 +1801,10 @@
+@@ -1811,10 +1811,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -361,31 +257,9 @@ Use system copy of libv8
#include <wtf/Vector.h>
using namespace std;
---- a/src/webkit/plugins/ppapi/var.cc
-+++ b/src/webkit/plugins/ppapi/var.cc
-@@ -19,7 +19,7 @@
- #include "webkit/plugins/ppapi/plugin_object.h"
- #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
- #include "webkit/plugins/ppapi/resource_tracker.h"
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- using WebKit::WebBindings;
-
---- a/src/third_party/WebKit/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
-+++ b/src/third_party/WebKit/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
-@@ -66,7 +66,7 @@
- #include <v8.h>
-
- #if ENABLE(JAVASCRIPT_I18N_API)
--#include <v8/src/extensions/experimental/i18n-extension.h>
-+#include <i18n-extension.h>
- #endif
-
- #include <wtf/Assertions.h>
--- a/src/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/src/chrome/browser/task_manager/task_manager_resource_providers.cc
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
#include "third_party/sqlite/sqlite3.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -396,7 +270,7 @@ Use system copy of libv8
#include "skia/ext/skia_utils_mac.h"
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
-@@ -1422,7 +1422,7 @@
+@@ -1376,7 +1376,7 @@
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
@@ -407,25 +281,25 @@ Use system copy of libv8
'conditions': [
--- a/src/chrome/chrome_tests.gypi
+++ b/src/chrome/chrome_tests.gypi
-@@ -1244,7 +1244,7 @@
- '../third_party/libxml/libxml.gyp:libxml',
+@@ -1248,7 +1248,7 @@
'../ui/gfx/gl/gl.gyp:gl',
'../ui/ui.gyp:ui_resources',
+ '../ui/ui.gyp:ui_resources_standard',
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
'chrome_resources',
'chrome_strings',
],
-@@ -2379,7 +2379,7 @@
- '../third_party/cld/cld.gyp:cld',
+@@ -2348,7 +2348,7 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
+ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
'../webkit/webkit.gyp:test_shell_test_support',
# Runtime dependencies
'../third_party/mesa/mesa.gyp:osmesa',
-@@ -2852,7 +2852,7 @@
+@@ -2856,7 +2856,7 @@
],
'dependencies': [
# build time dependency.
@@ -436,7 +310,7 @@ Use system copy of libv8
],
--- a/src/chrome/renderer/chrome_render_process_observer.cc
+++ b/src/chrome/renderer/chrome_render_process_observer.cc
-@@ -39,7 +39,7 @@
+@@ -41,7 +41,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ -447,8 +321,8 @@ Use system copy of libv8
#include "base/win/iat_patch_function.h"
--- a/src/chrome/renderer/extensions/bindings_utils.cc
+++ b/src/chrome/renderer/extensions/bindings_utils.cc
-@@ -14,7 +14,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
+@@ -10,7 +10,7 @@
+ #include "content/renderer/render_view.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "v8/include/v8.h"
@@ -458,7 +332,7 @@ Use system copy of libv8
using WebKit::WebView;
--- a/src/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/src/chrome/renderer/extensions/extension_dispatcher.cc
-@@ -23,7 +23,7 @@
+@@ -25,7 +25,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
@@ -467,17 +341,6 @@ Use system copy of libv8
namespace {
static const double kInitialExtensionIdleHandlerDelayS = 5.0 /* seconds */;
---- a/src/chrome/renderer/extensions/extension_process_bindings.h
-+++ b/src/chrome/renderer/extensions/extension_process_bindings.h
-@@ -12,7 +12,7 @@
- #include <string>
- #include <vector>
-
--#include "v8/include/v8.h"
-+#include <v8.h>
-
- class ExtensionDispatcher;
- class GURL;
--- a/src/chrome/renderer/external_extension.cc
+++ b/src/chrome/renderer/external_extension.cc
@@ -12,7 +12,7 @@
@@ -502,7 +365,7 @@ Use system copy of libv8
using WebKit::WebDocument;
--- a/src/content/renderer/render_thread.cc
+++ b/src/content/renderer/render_thread.cc
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ -513,7 +376,7 @@ Use system copy of libv8
#include "webkit/glue/webkit_glue.h"
--- a/src/content/renderer/render_view.cc
+++ b/src/content/renderer/render_view.cc
-@@ -123,7 +123,7 @@
+@@ -126,7 +126,7 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
@@ -557,7 +420,23 @@ Use system copy of libv8
protected:
--- a/src/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
+++ b/src/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
-@@ -617,7 +617,7 @@
+@@ -72,13 +72,13 @@
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+ '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
+- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
++ '<(chromium_src_dir)/build/linux/system.gyp:v8',
+ ],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/skia/skia.gyp:skia',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
++ '<(chromium_src_dir)/build/linux/system.gyp:v8',
+ ],
+ 'include_dirs': [
+ 'public',
+@@ -631,7 +631,7 @@
'<(chromium_src_dir)/third_party/modp_b64/modp_b64.gyp:modp_b64',
'<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
'<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
@@ -566,7 +445,7 @@ Use system copy of libv8
# We must not add webkit_support here because of cyclic dependency.
],
'direct_dependent_settings': {
-@@ -627,7 +627,7 @@
+@@ -641,7 +641,7 @@
},
'export_dependent_settings': [
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
@@ -575,8 +454,8 @@ Use system copy of libv8
],
'include_dirs': [
# WARNING: Do not view this particular case as a precedent for
-@@ -965,7 +965,7 @@
- '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
+@@ -990,7 +990,7 @@
+ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
@@ -584,17 +463,6 @@ Use system copy of libv8
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
],
---- a/src/webkit/support/test_webkit_client.cc
-+++ b/src/webkit/support/test_webkit_client.cc
-@@ -32,7 +32,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
--#include "v8/include/v8.h"
-+#include <v8.h>
- #include "webkit/appcache/web_application_cache_host_impl.h"
- #include "webkit/database/vfs_backend.h"
- #include "webkit/extensions/v8/gc_extension.h"
--- a/src/webkit/tools/test_shell/test_shell_webkit_init.cc
+++ b/src/webkit/tools/test_shell/test_shell_webkit_init.cc
@@ -14,7 +14,7 @@
@@ -614,9 +482,9 @@ Use system copy of libv8
'../ui/gfx/surface/surface.gyp:surface',
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
+ '../webkit/support/webkit_support.gyp:webkit_gpu',
],
'include_dirs': [
- '..',
--- a/src/third_party/WebKit/Source/ThirdParty/gyp/samples/samples
+++ b/src/third_party/WebKit/Source/ThirdParty/gyp/samples/samples
@@ -38,7 +38,7 @@ gyps = [
@@ -642,7 +510,7 @@ Use system copy of libv8
@@ -358,7 +358,7 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/leveldb/leveldb.gyp:leveldb',
+ '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<(DEPTH)/build/linux/system.gyp:v8',
],
@@ -681,3 +549,267 @@ Use system copy of libv8
using WebKit::WebCString;
using WebKit::WebDataSource;
+--- a/src/chrome/renderer/automation/dom_automation_v8_extension.cc
++++ b/src/chrome/renderer/automation/dom_automation_v8_extension.cc
+@@ -6,7 +6,7 @@
+
+ #include "chrome/renderer/extensions/extension_base.h"
+ #include "grit/renderer_resources.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ const char kName[] = "chrome/domautomation";
+
+--- a/src/chrome/renderer/extensions/chrome_webstore_bindings.cc
++++ b/src/chrome/renderer/extensions/chrome_webstore_bindings.cc
+@@ -16,7 +16,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using WebKit::WebDocument;
+ using WebKit::WebElement;
+--- a/src/chrome/renderer/extensions/event_bindings.cc
++++ b/src/chrome/renderer/extensions/event_bindings.cc
+@@ -32,7 +32,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using bindings_utils::CallFunctionInContext;
+ using bindings_utils::ContextInfo;
+--- a/src/chrome/renderer/extensions/extension_base.cc
++++ b/src/chrome/renderer/extensions/extension_base.cc
+@@ -17,7 +17,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+ #include "ui/base/resource/resource_bundle.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using WebKit::WebFrame;
+ using WebKit::WebView;
+--- a/src/chrome/renderer/extensions/extension_base.h
++++ b/src/chrome/renderer/extensions/extension_base.h
+@@ -7,7 +7,7 @@
+ #pragma once
+
+ #include "base/logging.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ #include <string>
+
+--- a/src/chrome/renderer/extensions/extension_process_bindings.cc
++++ b/src/chrome/renderer/extensions/extension_process_bindings.cc
+@@ -40,7 +40,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "third_party/skia/include/core/SkColor.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+ #include "webkit/glue/webkit_glue.h"
+
+ using bindings_utils::GetPendingRequestMap;
+--- a/src/chrome/renderer/extensions/js_only_v8_extensions.cc
++++ b/src/chrome/renderer/extensions/js_only_v8_extensions.cc
+@@ -6,7 +6,7 @@
+
+ #include "chrome/renderer/extensions/extension_base.h"
+ #include "grit/renderer_resources.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ // JsonSchemaJsV8Extension
+ const char* JsonSchemaJsV8Extension::kName = "chrome/jsonschema";
+--- a/src/chrome/renderer/extensions/renderer_extension_bindings.cc
++++ b/src/chrome/renderer/extensions/renderer_extension_bindings.cc
+@@ -19,7 +19,7 @@
+ #include "content/renderer/render_thread.h"
+ #include "content/renderer/render_view.h"
+ #include "grit/renderer_resources.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ // Message passing API example (in a content script):
+ // var extension =
+--- a/src/chrome/test/base/v8_unit_test.h
++++ b/src/chrome/test/base/v8_unit_test.h
+@@ -9,7 +9,7 @@
+ #include <string>
+
+ #include "testing/gtest/include/gtest/gtest.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace base {
+ class StringPiece;
+--- a/src/content/renderer/mock_content_renderer_client.cc
++++ b/src/content/renderer/mock_content_renderer_client.cc
+@@ -5,7 +5,7 @@
+ #include "content/renderer/mock_content_renderer_client.h"
+
+ #include <string>
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace content {
+
+--- a/src/third_party/v8-i18n/build/all.gyp
++++ b/src/third_party/v8-i18n/build/all.gyp
+@@ -51,7 +51,7 @@
+ '<(icu_path)/public/common',
+ ],
+ 'dependencies': [
+- '<(v8_path)/v8/tools/gyp/v8.gyp:v8',
++ '<(v8_path)/build/linux/system.gyp:v8',
+ '<(icu_path)/icu.gyp:*',
+ 'api2c#host',
+ ],
+--- a/src/third_party/v8-i18n/include/extension.h
++++ b/src/third_party/v8-i18n/include/extension.h
+@@ -15,7 +15,7 @@
+ #ifndef V8_I18N_INCLUDE_EXTENSION_H_
+ #define V8_I18N_INCLUDE_EXTENSION_H_
+
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace v8_i18n {
+
+--- a/src/third_party/v8-i18n/src/break-iterator.h
++++ b/src/third_party/v8-i18n/src/break-iterator.h
+@@ -16,7 +16,7 @@
+ #define V8_I18N_SRC_BREAK_ITERATOR_H_
+
+ #include "unicode/uversion.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace U_ICU_NAMESPACE {
+ class BreakIterator;
+--- a/src/third_party/v8-i18n/src/collator.h
++++ b/src/third_party/v8-i18n/src/collator.h
+@@ -29,7 +29,7 @@
+ #define V8_I18N_SRC_COLLATOR_H_
+
+ #include "unicode/uversion.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace U_ICU_NAMESPACE {
+ class Collator;
+--- a/src/third_party/v8-i18n/src/datetime-format.h
++++ b/src/third_party/v8-i18n/src/datetime-format.h
+@@ -16,7 +16,7 @@
+ #define V8_I18N_SRC_DATETIME_FORMAT_H_
+
+ #include "unicode/uversion.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace U_ICU_NAMESPACE {
+ class SimpleDateFormat;
+--- a/src/third_party/v8-i18n/src/language-matcher.h
++++ b/src/third_party/v8-i18n/src/language-matcher.h
+@@ -16,7 +16,7 @@
+ #define V8_I18N_SRC_LANGUAGE_MATCHER_H_
+
+ #include "unicode/uloc.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace v8_i18n {
+
+--- a/src/third_party/v8-i18n/src/number-format.h
++++ b/src/third_party/v8-i18n/src/number-format.h
+@@ -16,7 +16,7 @@
+ #define V8_I18N_SRC_NUMBER_FORMAT_H_
+
+ #include "unicode/uversion.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace U_ICU_NAMESPACE {
+ class DecimalFormat;
+--- a/src/third_party/v8-i18n/src/utils.h
++++ b/src/third_party/v8-i18n/src/utils.h
+@@ -16,7 +16,7 @@
+ #define V8_I18N_SRC_UTILS_H_
+
+ #include "unicode/uversion.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ namespace U_ICU_NAMESPACE {
+ class UnicodeString;
+--- a/src/v8/src/extensions/experimental/break-iterator.h
++++ b/src/v8/src/extensions/experimental/break-iterator.h
+@@ -28,7 +28,7 @@
+ #ifndef V8_EXTENSIONS_EXPERIMENTAL_BREAK_ITERATOR_H_
+ #define V8_EXTENSIONS_EXPERIMENTAL_BREAK_ITERATOR_H_
+
+-#include "include/v8.h"
++#include <v8.h>
+
+ #include "unicode/uversion.h"
+
+--- a/src/webkit/extensions/v8/gc_extension.cc
++++ b/src/webkit/extensions/v8/gc_extension.cc
+@@ -4,7 +4,7 @@
+
+ #include "webkit/extensions/v8/gc_extension.h"
+
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ const char kGCExtensionName[] = "v8/GCController";
+
+--- a/src/webkit/extensions/v8/heap_profiler_extension.cc
++++ b/src/webkit/extensions/v8/heap_profiler_extension.cc
+@@ -5,7 +5,7 @@
+ #include "webkit/extensions/v8/heap_profiler_extension.h"
+
+ #include "base/basictypes.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ #if defined(USE_TCMALLOC) && !defined(OS_WIN)
+ #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
+--- a/src/webkit/glue/webkitplatformsupport_impl.cc
++++ b/src/webkit/glue/webkitplatformsupport_impl.cc
+@@ -45,7 +45,7 @@
+ #include "webkit/glue/weburlloader_impl.h"
+
+ #if defined(OS_LINUX)
+-#include "v8/include/v8.h"
++#include <v8.h>
+ #endif
+
+ using WebKit::WebAudioBus;
+--- a/src/webkit/plugins/ppapi/ppb_var_impl.cc
++++ b/src/webkit/plugins/ppapi/ppb_var_impl.cc
+@@ -17,7 +17,7 @@
+ #include "webkit/plugins/ppapi/plugin_object.h"
+ #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+ #include "webkit/plugins/ppapi/resource_tracker.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using ppapi::NPObjectVar;
+ using ppapi::StringVar;
+--- a/src/webkit/support/test_webkit_platform_support.cc
++++ b/src/webkit/support/test_webkit_platform_support.cc
+@@ -32,7 +32,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+ #include "webkit/appcache/web_application_cache_host_impl.h"
+ #include "webkit/database/vfs_backend.h"
+ #include "webkit/extensions/v8/gc_extension.h"
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 74d3928..4a3ed00 100644
--- a/debian/patches/webkit-version.patch
+++ b/debian/patches/webkit-version.patch
@@ -2,8 +2,8 @@
+++ b/src/webkit/build/webkit_version.py
@@ -60,6 +60,15 @@ def GetWebKitRevision(webkit_dir, versio
default_lastchange=None,
- directory=os.path.join(webkit_dir, version_file_dir))
-
+ directory=os.path.join(webkit_dir, version_file_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()
@@ -13,6 +13,6 @@
+ branch = os.path.basename(x.group(1)) if x else "n-a"
+ return "%s@%s" % (branch, rev)
+
- if (version_info.url.startswith(version_info.root) and
- version_info.url.endswith(version_file_dir)):
- # Now compute the real WebKit URL by stripping off the version file
+
+ if version_info.url == None:
+ version_info.url = 'Unknown URL'
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list