[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/13.0.782.215_r97094-1-14-gcd75f10
Giuseppe Iuculano
iuculano at debian.org
Sat Aug 27 17:46:01 UTC 2011
The following commit has been merged in the experimental branch:
commit 736bf8b277e4a322175b1160918b627fc2932b51
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Sat Aug 27 13:49:11 2011 +0200
Use libv8 system copy
diff --git a/debian/changelog b/debian/changelog
index fc93bd5..7f4ce90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ chromium-browser (14.0.835.109~r97804-1) UNRELEASED; urgency=low
* New beta release
* Fix gbp.conf for experimental branch
* Refreshed patches
+ * Use libv8 system copy
- -- Giuseppe Iuculano <iuculano at debian.org> Thu, 25 Aug 2011 14:36:05 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org> Sat, 27 Aug 2011 13:48:51 +0200
chromium-browser (13.0.782.215~r97094-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 737c3d5..e81d2fd 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,8 @@ Build-Depends: cdbs,
binutils-gold,
libflac-dev,
libwebp-dev,
- autotools-dev
+ autotools-dev,
+ libv8-dev (>= 3.4.14.13)
Standards-Version: 3.9.2
Package: chromium-browser
diff --git a/debian/patches/series b/debian/patches/series
index ab4755b..d003115 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,5 @@ webkit-version.patch
#protobuf.patch
#javascript-i18n.patch
#icu.patch
-#system_v8.patch
cups1.5.patch
+system_v8.patch
diff --git a/debian/patches/system_v8.patch b/debian/patches/system_v8.patch
index 774b5c8..9d29f76 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
-@@ -360,6 +360,18 @@
+@@ -343,6 +343,18 @@
}]]
},
{
@@ -17,12 +17,12 @@ Use system copy of libv8
+ }]]
+ },
+ {
- 'target_name': 'gnome-keyring',
+ 'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
--- a/src/net/net.gyp
+++ b/src/net/net.gyp
-@@ -669,7 +669,7 @@
+@@ -690,7 +690,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -44,7 +44,7 @@ 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
-@@ -61,7 +61,7 @@
+@@ -63,7 +63,7 @@
#include "webkit/plugins/npapi/webplugininfo.h"
#ifdef CHROME_V8
@@ -55,7 +55,7 @@ Use system copy of libv8
#if defined(OS_WIN)
--- a/src/chrome/browser/memory_purger.cc
+++ b/src/chrome/browser/memory_purger.cc
-@@ -24,7 +24,7 @@
+@@ -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"
@@ -143,7 +143,7 @@ Use system copy of libv8
class StringPiece;
--- a/src/net/proxy/proxy_resolver_v8.cc
+++ b/src/net/proxy/proxy_resolver_v8.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
#include "net/proxy/proxy_resolver_js_bindings.h"
#include "net/proxy/proxy_resolver_request_context.h"
#include "net/proxy/proxy_resolver_script.h"
@@ -209,7 +209,7 @@ Use system copy of libv8
--- a/src/webkit/glue/webkit_glue.cc
+++ b/src/webkit/glue/webkit_glue.cc
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
#endif
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/user_agent.h"
@@ -244,9 +244,9 @@ Use system copy of libv8
#include "webkit/tools/test_shell/test_shell_test.h"
--- a/src/chrome/renderer/extensions/chrome_app_bindings.cc
+++ b/src/chrome/renderer/extensions/chrome_app_bindings.cc
-@@ -18,7 +18,7 @@
- #include "content/renderer/render_view.h"
+@@ -19,7 +19,7 @@
#include "content/renderer/v8_value_converter.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "v8/include/v8.h"
+#include <v8.h>
@@ -266,7 +266,7 @@ Use system copy of libv8
using WebKit::WebView;
--- a/src/webkit/glue/webkit_glue.gypi
+++ b/src/webkit/glue/webkit_glue.gypi
-@@ -505,11 +505,11 @@
+@@ -502,11 +502,11 @@
['inside_chromium_build==1 and component=="shared_library"', {
'dependencies': [
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -293,9 +293,9 @@ Use system copy of libv8
using WebKit::WebScriptSource;
--- a/src/v8/tools/gyp/v8.gyp
+++ b/src/v8/tools/gyp/v8.gyp
-@@ -954,7 +954,7 @@
- 'target_name': 'v8_shell',
+@@ -964,7 +964,7 @@
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
- 'v8'
+ '../../../build/linux/system.gyp:v8',
@@ -304,7 +304,7 @@ Use system copy of libv8
'../../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
-@@ -949,7 +949,7 @@
+@@ -972,7 +972,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -313,7 +313,7 @@ Use system copy of libv8
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-@@ -1063,10 +1063,10 @@
+@@ -1086,10 +1086,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -326,7 +326,7 @@ Use system copy of libv8
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-@@ -1644,7 +1644,7 @@
+@@ -1754,7 +1754,7 @@
}],
['javascript_engine=="v8"', {
'dependencies': [
@@ -335,7 +335,7 @@ Use system copy of libv8
],
}],
],
-@@ -1689,10 +1689,10 @@
+@@ -1801,10 +1801,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -372,17 +372,6 @@ Use system copy of libv8
using WebKit::WebBindings;
---- a/src/chrome/browser/ui/webui/options/about_page_handler.cc
-+++ b/src/chrome/browser/ui/webui/options/about_page_handler.cc
-@@ -29,7 +29,7 @@
- #include "webkit/glue/webkit_glue.h"
-
- #if defined(CHROME_V8)
--#include "v8/include/v8.h"
-+#include <v8.h>
- #endif
-
- #if defined(OS_CHROMEOS)
--- 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 @@
@@ -407,7 +396,7 @@ Use system copy of libv8
#include "skia/ext/skia_utils_mac.h"
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
-@@ -1356,7 +1356,7 @@
+@@ -1422,7 +1422,7 @@
'../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
@@ -418,39 +407,48 @@ Use system copy of libv8
'conditions': [
--- a/src/chrome/chrome_tests.gypi
+++ b/src/chrome/chrome_tests.gypi
-@@ -1197,7 +1197,7 @@
- '../third_party/libjingle/libjingle.gyp:libjingle',
+@@ -1244,7 +1244,7 @@
'../third_party/libxml/libxml.gyp:libxml',
'../ui/gfx/gl/gl.gyp:gl',
+ '../ui/ui.gyp:ui_resources',
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
'chrome_resources',
'chrome_strings',
],
-@@ -2234,7 +2234,7 @@
+@@ -2379,7 +2379,7 @@
'../third_party/cld/cld.gyp:cld',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
- '../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',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
+@@ -2852,7 +2852,7 @@
+ ],
+ 'dependencies': [
+ # build time dependency.
+- '../v8/tools/gyp/v8.gyp:v8_shell#host',
++ '../build/linux/system.gyp:v8',
+ # run time dependency
+ '../webkit/webkit.gyp:copy_npapi_test_plugin',
+ ],
--- a/src/chrome/renderer/chrome_render_process_observer.cc
+++ b/src/chrome/renderer/chrome_render_process_observer.cc
-@@ -34,7 +34,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
+@@ -39,7 +39,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"
-#include "v8/include/v8.h"
+#include <v8.h>
#if defined(OS_WIN)
- #include "app/win/iat_patch_function.h"
+ #include "base/win/iat_patch_function.h"
--- a/src/chrome/renderer/extensions/bindings_utils.cc
+++ b/src/chrome/renderer/extensions/bindings_utils.cc
-@@ -13,7 +13,7 @@
- #include "content/renderer/render_view.h"
+@@ -14,7 +14,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.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"
@@ -482,8 +480,8 @@ Use system copy of libv8
class GURL;
--- a/src/chrome/renderer/external_extension.cc
+++ b/src/chrome/renderer/external_extension.cc
-@@ -11,7 +11,7 @@
- #include "content/renderer/render_view.h"
+@@ -12,7 +12,7 @@
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.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"
@@ -504,7 +502,7 @@ Use system copy of libv8
using WebKit::WebDocument;
--- a/src/content/renderer/render_thread.cc
+++ b/src/content/renderer/render_thread.cc
-@@ -59,7 +59,7 @@
+@@ -64,7 +64,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"
@@ -515,7 +513,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
-@@ -121,7 +121,7 @@
+@@ -123,7 +123,7 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
@@ -528,7 +526,7 @@ Use system copy of libv8
+++ b/src/content/renderer/v8_value_converter.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
- #include "base/scoped_ptr.h"
+ #include "base/memory/scoped_ptr.h"
#include "base/values.h"
-#include "v8/include/v8.h"
+#include <v8.h>
@@ -544,8 +542,8 @@ Use system copy of libv8
-#include "v8/include/v8.h"
+#include <v8.h>
- class Value;
- class ListValue;
+ namespace base {
+ class DictionaryValue;
--- a/src/content/renderer/v8_value_converter_browsertest.cc
+++ b/src/content/renderer/v8_value_converter_browsertest.cc
@@ -8,7 +8,7 @@
@@ -559,7 +557,7 @@ 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
-@@ -615,7 +615,7 @@
+@@ -617,7 +617,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',
@@ -568,18 +566,18 @@ Use system copy of libv8
# We must not add webkit_support here because of cyclic dependency.
],
'direct_dependent_settings': {
-@@ -625,7 +625,7 @@
+@@ -627,7 +627,7 @@
},
'export_dependent_settings': [
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
- 'sources': [
- '<@(webkit_unittest_files)',
+ 'include_dirs': [
+ # WARNING: Do not view this particular case as a precedent for
--- a/src/webkit/support/test_webkit_client.cc
+++ b/src/webkit/support/test_webkit_client.cc
-@@ -31,7 +31,7 @@
+@@ -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"
diff --git a/debian/rules b/debian/rules
index e5f0aa8..e5263fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ WANT_SYSTEM_LIBS ?= 1
WANT_SHARED_LIBS ?= 0
WANT_TESTS ?= 0
WANT_SANDBOXING ?= 1
-USE_SYSTEM_V8 ?= 0
+USE_SYSTEM_V8 ?= 1
VERBOSE ?= 0
export DEB_BUILD_HARDENING=1
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list