[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 763 releasing version 11.0.696.68~r84545-2

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 763
Revision Id: iuculano at debian.org-20110518080628-a2gy5fa55uxdc0at
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : releasing version 11.0.696.68~r84545-2

--------------------------------------------------------
  ** Added :
        - debian/patches/javascript-i18n.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series
        - debian/patches/system_v8.patch

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-05-16 23:17:13 +0000
+++ b/debian/changelog	2011-05-18 08:06:28 +0000
@@ -1,3 +1,11 @@
+chromium-browser (11.0.696.68~r84545-2) unstable; urgency=low
+
+  * Fix the libv8 patch
+  * Disable javascript i18n api, we will re-enable it when libv8 will compile
+    i18n experimental extension, #627066
+
+ -- Giuseppe Iuculano <iuculano at debian.org>  Tue, 17 May 2011 22:18:11 +0200
+
 chromium-browser (11.0.696.68~r84545-1) unstable; urgency=high
 
   * New Stable release:

=== added file 'debian/patches/javascript-i18n.patch'
--- a/debian/patches/javascript-i18n.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/javascript-i18n.patch	2011-05-18 08:06:28 +0000
@@ -0,0 +1,11 @@
+--- a/src/build/features_override.gypi
++++ b/src/build/features_override.gypi
+@@ -25,7 +25,7 @@
+       'ENABLE_DIRECTORY_UPLOAD=1',
+       'ENABLE_DOM_STORAGE=1',
+       'ENABLE_EVENTSOURCE=1',
+-      'ENABLE_JAVASCRIPT_I18N_API=1',
++      'ENABLE_JAVASCRIPT_I18N_API=0',
+       'ENABLE_FILE_SYSTEM=1',
+       'ENABLE_FILTERS=1',
+       'ENABLE_FULLSCREEN_API=1',

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2011-05-16 23:17:13 +0000
+++ b/debian/patches/series	2011-05-18 08:06:28 +0000
@@ -19,3 +19,4 @@
 gcc46.patch
 #vpx.patch
 protobuf.patch
+javascript-i18n.patch

=== modified file 'debian/patches/system_v8.patch'
--- a/debian/patches/system_v8.patch	2011-04-28 17:31:40 +0000
+++ b/debian/patches/system_v8.patch	2011-05-18 08:06:28 +0000
@@ -416,6 +416,15 @@
            ],
            'conditions': [
              ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+@@ -1550,7 +1550,7 @@
+         }],
+         ['javascript_engine=="v8"', {
+           'dependencies': [
+-            '<(chromium_src_dir)/v8/src/extensions/experimental/experimental.gyp:i18n_api',
++            '<(chromium_src_dir)/build/linux/system.gyp:v8',
+           ],
+         }],
+       ],
 @@ -1595,10 +1595,10 @@
        'conditions': [
          ['javascript_engine=="v8"', {
@@ -475,3 +484,14 @@
  #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
+@@ -65,7 +65,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>