[meego-commits] 7280: Changes to Trunk:Testing/chromium
Wei James
no_reply at build.meego.com
Fri Sep 3 02:19:02 UTC 2010
Hi,
I have made the following changes to chromium in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Wei James
[This message was auto-generated]
---
Request #7280:
submit: home:xwei1:branches:Trunk:Testing/chromium(r8)(cleanup) -> Trunk:Testing/chromium
Message:
Fix BMC#4934, upgrade to chromium 6.0.486.0
State: new 2010-09-02T19:18:45 xwei1
Comment: None
changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Wed Sep 1 Wei James <james.wei at intel.com> - 6.0.486.0
+- Fix BMC#4934 by upgrading chromium to 6.0.486.0, svn r55059
+
old:
----
chromium-20100315-shared-chromiumthreading.patch
chromium-20100506-expose-chromium-browser-api.patch
chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
chromium-5.0.395.0-icu-code-changes.patch
chromium-6.0.406.0-sharedlibfixes.patch
chromium-6.0.406.0-system-gyp-v8.patch
chromium-6.0.417.0-20100526svn48276.tar.bz2
chromium-6.0.417.0-gyp-system-icu.patch
chromium-bold-cjk-droid-font-fix-svn48276.patch
chromium-option-window-layout-svn48276.patch
chromium-webkit-droid-sans-fontconfig-fix.patch
ffmpegfix.patch
new:
----
chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
chromium-6.0.425.0-ffmpegfix.patch
chromium-6.0.425.0-system-expat.patch
chromium-6.0.451.0-shared-chromiumthreading.patch
chromium-6.0.453.1-system-gyp-v8.patch
chromium-6.0.476.0-sharedlibfixes.patch
chromium-6.0.486.0-20100805svn55059.tar.bz2
chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
chromium-6.0.486.0-gyp-system-icu.patch
chromium-6.0.486.0-icu-code-changes.patch
chromium-expose-chromium-browser-api.patch
webkit-complex-font-selection-fix.patch
spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -1,9 +1,9 @@
-%global svndate 20100526
-%global svnver svn48276
-%global v8ver 2.2.12
+%global svndate 20100805
+%global svnver svn55059
+%global v8ver 2.3.5-1.20100806svn5198
# Useful for debugging
-%global noisy 1
+%global noisy 0
## Maybe, someday, I'll be able to flip these on. ##
@@ -19,7 +19,7 @@
Name: chromium
# see chrome/VERSION
-Version: 6.0.417.0
+Version: 6.0.486.0
Release: 1%{?dist}
Summary: A WebKit powered web browser
# Licensing Overview
@@ -28,22 +28,22 @@
# libjingle is BSD
# Just the code changes, none of the "makefile" changes
-Patch0: chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
+Patch0: chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
# These are the conditionals that upstream has added:
# bzip2, jpeg, png, zlib, xml, xslt, libevent
# Hack support in for system v8
-Patch2: chromium-6.0.406.0-system-gyp-v8.patch
+Patch2: chromium-6.0.453.1-system-gyp-v8.patch
# We also remove minizip, which google left in because ubuntu doesn't have it. :P
Patch4: chromium-20090807-gyp-system-minizip.patch
# Use system libicu
-Patch7: chromium-6.0.417.0-gyp-system-icu.patch
+Patch7: chromium-6.0.486.0-gyp-system-icu.patch
# Code changes to use system libicu
-Patch8: chromium-5.0.395.0-icu-code-changes.patch
+Patch8: chromium-6.0.486.0-icu-code-changes.patch
# Revert this change to stop crashes
# http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/sqlite_utils.cc?r1=24321&r2=25633
@@ -53,10 +53,10 @@
Patch10: chromium-20100419-system-nss.patch
# Fix shared libs
-Patch11: chromium-6.0.406.0-sharedlibfixes.patch
+Patch11: chromium-6.0.476.0-sharedlibfixes.patch
# Fix ChromiumThreading issue in wtf shared lib
-Patch12: chromium-20100315-shared-chromiumthreading.patch
+Patch12: chromium-6.0.451.0-shared-chromiumthreading.patch
# Don't use the second copy of zlib
Patch13: chromium-20100315-system-zlib.patch
@@ -80,20 +80,17 @@
Patch19: chromium-no-test-sources.patch
# Fix the wrapper
-#Patch20: chromium-fix-wrapper.patch
-
-# Set master_prefs to a sane location
-#Patch21: chromium-master-prefs-path.patch
+# Patch20: chromium-fix-wrapper.patch
# Fix media probing
Patch22: chromium-6.0.412.0-media-probe.patch
# Use system expat
-Patch23: chromium-20100408-system-expat.patch
+Patch23: chromium-6.0.425.0-system-expat.patch
# Fix ffmpeg wrapper compile
-Patch24: ffmpegfix.patch
-Patch25: chromium-20100408-ffmpeg-no-pkgconfig.patch
+Patch24: chromium-6.0.425.0-ffmpegfix.patch
+Patch25: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
# Fix zlib gyp file to not build empty shell
Patch26: chromium-20100408-no-empty-shell-zlib.patch
@@ -103,6 +100,7 @@
################# patches from fedora ends ###############################
+
# Fix gcc4.5 NULL converstion errors
Patch28: chromium-fix-gcc-4.5-build-errors.patch
@@ -126,30 +124,20 @@
############### patches for MeeGo integration start
-#patch to adjust option window size and position for compact screen
-Patch201: chromium-option-window-layout-svn48276.patch
-
#patch to let window manager to switch browser's zone to font
Patch202: chromium-browser-window-focus.patch
-#patch to fix the bold CJK font rendering issue
-Patch203: chromium-bold-cjk-droid-font-fix-svn48276.patch
-
#patch to fix default browser setting issue
Patch204: chromium-20100319-default-browser-setting.patch
#patch to expose chromium browser api
-Patch205: chromium-20100506-expose-chromium-browser-api.patch
+Patch205: chromium-expose-chromium-browser-api.patch
# patch to fix flash plugin BMC#618 and BMC#484
Patch206: chromium-20100415-flash-plugin-crash-fix.patch
-# Fix icon size cut off in MeeGo 1.0
-#Patch207: chromium-fix-toolbar-icon-size.patch
-
# Fix droid sans font rendering issue
-Patch208: chromium-webkit-droid-sans-fontconfig-fix.patch
-
+Patch208: webkit-complex-font-selection-fix.patch
################ patches for MeeGo integration ends
@@ -171,6 +159,7 @@
BuildRequires: pkgconfig(glu), libXScrnSaver-devel, expat-devel, fdupes
BuildRequires: python, cups-devel
+BuildRequires: libgnome-keyring-devel
# NaCl needs these
BuildRequires: libstdc++-devel, openssl-devel
@@ -300,12 +289,13 @@
%patch27 -p1 -b .fix-yrp
# Fix gcc4.5 NULL converstion errors
-%patch28 -p1 -b .fix-gcc-4.5
+%patch28 -p0 -b .fix-gcc-4.5
# Fix tcmalloc gcc4.5 issue
%patch29 -p1 -b .fix-tcmalloc-4.5
+
#patch to re-org the visibility options in Chromium browser build
#%patch101 -p1
@@ -315,15 +305,12 @@
#patch to explicitly export symbols in WebCore
#%patch103 -p1
-#patches for MeeGo integration
-%patch201 -p1
+##patches for MeeGo integration
%patch202 -p1
-%patch203 -p1
%patch204 -p1
%patch205 -p1
%patch206 -p1
-#%patch207 -p1
-%patch208 -p1
+%patch208 -p1 -d third_party/WebKit
# Scrape out incorrect optflags and hack in the correct ones
PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-strict-aliasing -fno-ipa-cp \' | sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -398,7 +385,7 @@
mkdir -p %{buildroot}%{_libdir}/chromium-browser/
mkdir -p %{buildroot}%{_mandir}/man1/
pushd out/Release
-cp -a chrome.pak locales resources xdg-settings %{buildroot}%{_libdir}/chromium-browser/
+cp -a chrome.pak locales resources resources.pak xdg-settings %{buildroot}%{_libdir}/chromium-browser/
cp -a chrome %{buildroot}%{_libdir}/chromium-browser/chromium-browser
cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium-browser/
cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium-browser/
@@ -470,6 +457,7 @@
%defattr(-,root,root,-)
%dir %{_libdir}/chromium-browser/
%{_libdir}/chromium-browser/chrome.pak
+%{_libdir}/chromium-browser/resources.pak
%{_libdir}/chromium-browser/locales/
%{_libdir}/chromium-browser/libapp_base.so
%{_libdir}/chromium-browser/liballocator.so
@@ -478,6 +466,19 @@
%{_libdir}/chromium-browser/libbase_i18n.so
%{_libdir}/chromium-browser/libbrowser.so
%{_libdir}/chromium-browser/libchrome_gpu.so
+
+%{_libdir}/chromium-browser/libcacheinvalidation.so
+%{_libdir}/chromium-browser/libchromoting_base.so
+%{_libdir}/chromium-browser/libchromoting_client.so
+%{_libdir}/chromium-browser/libchromoting_host.so
+%{_libdir}/chromium-browser/libchromoting_jingle_glue.so
+%{_libdir}/chromium-browser/libchromotocol_proto_lib.so
+%{_libdir}/chromium-browser/libdefault_plugin.so
+%{_libdir}/chromium-browser/libgtest.so
+%{_libdir}/chromium-browser/libhttp_listen_socket.so
+%{_libdir}/chromium-browser/libjingle_p2p.so
+%{_libdir}/chromium-browser/libsync_notifier.so
+
%{_libdir}/chromium-browser/libcld.so
%{_libdir}/chromium-browser/libcommon.so
%{_libdir}/chromium-browser/libcommon_net.so
other changes:
--------------
++++++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch (new)
--- chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
+++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
+diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp
+--- chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD 2010-06-03 13:48:45.196313786 -0400
++++ chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp 2010-06-03 13:50:10.580325776 -0400
+@@ -818,12 +818,14 @@
+
+ # Add pkg-config result to include path when use_system_ffmpeg!=0
+ ['use_system_ffmpeg!=0', {
+- 'cflags': [
+- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+- ],
++ 'include_dirs': [
++ 'config',
++ 'patched-ffmpeg-mt',
++ ],
+ 'direct_dependent_settings': {
+- 'cflags': [
+- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
++ 'include_dirs': [
++ 'config',
++ 'patched-ffmpeg-mt',
+ ],
+ },
+ }, { # else use_system_ffmpeg==0, add local copy to include path
++++++ chromium-6.0.425.0-ffmpegfix.patch (new)
--- chromium-6.0.425.0-ffmpegfix.patch
+++ chromium-6.0.425.0-ffmpegfix.patch
+diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/patched-ffmpeg-mt/libavutil/pixfmt.h.ffmpegfix chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/patched-ffmpeg-mt/libavutil/pixfmt.h
+--- chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/patched-ffmpeg-mt/libavutil/pixfmt.h.ffmpegfix 2010-06-03 13:46:22.696200934 -0400
++++ chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/patched-ffmpeg-mt/libavutil/pixfmt.h 2010-06-03 13:46:29.641315858 -0400
+@@ -29,8 +29,6 @@
+ * header, so it should not be directly included in your projects.
+ */
+
+-#include "libavutil/avconfig.h"
+-
+ /**
+ * Pixel format. Notes:
+ *
++++++ chromium-6.0.425.0-system-expat.patch (new)
--- chromium-6.0.425.0-system-expat.patch
+++ chromium-6.0.425.0-system-expat.patch
+diff -up chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h.system-expat chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h
+--- chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h.system-expat 2010-06-03 14:30:56.000000000 -0400
++++ chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h 2010-06-03 16:58:16.607188633 -0400
+@@ -10,7 +10,7 @@
+ #include "base/basictypes.h"
+ #include "chrome/browser/autofill/field_types.h"
+ #include "chrome/browser/autofill/form_structure.h"
+-#include "third_party/expat/files/lib/expat.h"
++#include <expat.h>
+ #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
+
+ // The base class that contains common functionality between
+diff -up chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc.system-expat chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc
+--- chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc.system-expat 2010-06-03 14:54:53.000000000 -0400
++++ chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.cc 2010-06-03 16:58:16.608186731 -0400
+@@ -30,11 +30,7 @@
+ #include "talk/base/common.h"
+ #include "talk/xmllite/xmlelement.h"
+ #include "talk/xmllite/xmlbuilder.h"
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "lib/expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif // EXPAT_RELATIVE_PATH
++#include <expat.h>
+
+ namespace buzz {
+
+diff -up chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.h.system-expat chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
+--- chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.h.system-expat 2010-06-03 14:54:53.000000000 -0400
++++ chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2010-06-03 16:58:16.611189311 -0400
+@@ -33,11 +33,7 @@
+ #include "talk/base/scoped_ptr.h"
+ #include "talk/xmllite/xmlparser.h"
+
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "lib/expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif // EXPAT_RELATIVE_PATH
++#include <expat.h>
+
+ namespace buzz {
+
+diff -up chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.cc.system-expat chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.cc
+--- chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.cc.system-expat 2010-06-03 17:02:42.131321824 -0400
++++ chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.cc 2010-06-03 17:02:58.506317133 -0400
+@@ -35,11 +35,7 @@
+ #include "talk/xmllite/xmlnsstack.h"
+ #include "talk/xmllite/xmlconstants.h"
+ #include "talk/xmllite/xmlnsstack.h"
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "lib/expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif // EXPAT_RELATIVE_PATH
++#include <expat.h>
+
+ namespace buzz {
+
+diff -up chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.h.system-expat chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.h
+--- chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.h.system-expat 2010-06-03 14:54:53.000000000 -0400
++++ chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmllite/xmlparser.h 2010-06-03 16:58:16.613191652 -0400
+@@ -31,11 +31,7 @@
+ #include <string>
+
+ #include "talk/xmllite/xmlnsstack.h"
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "lib/expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif // EXPAT_RELATIVE_PATH
++#include <expat.h>
+
+ struct XML_ParserStruct;
+ typedef struct XML_ParserStruct* XML_Parser;
+diff -up chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc.system-expat chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+--- chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc.system-expat 2010-06-03 17:04:05.646306857 -0400
++++ chromium-6.0.425.0-20100603svn48849/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2010-06-03 17:04:19.983317059 -0400
+@@ -29,11 +29,7 @@
+ #include "talk/base/common.h"
+ #include "talk/xmpp/xmppstanzaparser.h"
+ #include "talk/xmpp/constants.h"
+-#ifdef EXPAT_RELATIVE_PATH
+-#include "lib/expat.h"
+-#else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+-#endif
++#include <expat.h>
+
+ namespace buzz {
+
++++++ chromium-6.0.451.0-shared-chromiumthreading.patch (new)
--- chromium-6.0.451.0-shared-chromiumthreading.patch
+++ chromium-6.0.451.0-shared-chromiumthreading.patch
+diff -up chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi.chromiumthreading chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi
+--- chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi.chromiumthreading 2010-06-30 04:51:07.000000000 -0400
++++ chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi 2010-06-30 15:17:53.784034617 -0400
+@@ -354,6 +354,7 @@
+ 'wtf/ByteArray.h',
+ 'wtf/chromium/ChromiumThreading.h',
+ 'wtf/chromium/MainThreadChromium.cpp',
++ '../WebKit/chromium/src/ChromiumThreading.cpp',
+ 'wtf/CrossThreadRefCounted.h',
+ 'wtf/CurrentTime.cpp',
+ 'wtf/CurrentTime.h',
+diff -up chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.chromiumthreading chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+--- chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.chromiumthreading 2010-06-30 15:17:53.696958269 -0400
++++ chromium-6.0.451.0/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp 2010-06-30 15:17:53.784034617 -0400
+@@ -103,6 +103,8 @@
+ '../',
+ '../wtf',
+ '../wtf/unicode',
++ '../../WebKit/chromium/public/',
++ '../../../..',
+ ],
+ 'sources': [
+ '<@(javascriptcore_files)',
+@@ -112,6 +114,7 @@
+ ['exclude', '../'],
+ # ... Then include what we want.
+ ['include', '../wtf/'],
++ ['include', '../../WebKit/chromium/src/ChromiumThreading.cpp'],
+ # GLib/GTK, even though its name doesn't really indicate.
+ ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
+ ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'],
+diff -up chromium-6.0.451.0/third_party/WebKit/WebKit/chromium/WebKit.gyp.chromiumthreading chromium-6.0.451.0/third_party/WebKit/WebKit/chromium/WebKit.gyp
+--- chromium-6.0.451.0/third_party/WebKit/WebKit/chromium/WebKit.gyp.chromiumthreading 2010-06-30 15:17:53.000000000 -0400
++++ chromium-6.0.451.0/third_party/WebKit/WebKit/chromium/WebKit.gyp 2010-06-30 15:18:40.640175877 -0400
+@@ -242,7 +242,6 @@
+ 'src/ChromeClientImpl.h',
+ 'src/ChromiumBridge.cpp',
+ 'src/ChromiumCurrentTime.cpp',
+- 'src/ChromiumThreading.cpp',
+ 'src/CompositionUnderlineBuilder.h',
+ 'src/CompositionUnderlineVectorBuilder.cpp',
+ 'src/CompositionUnderlineVectorBuilder.h',
++++++ chromium-6.0.406.0-system-gyp-v8.patch -> chromium-6.0.453.1-system-gyp-v8.patch
--- chromium-6.0.406.0-system-gyp-v8.patch
+++ chromium-6.0.453.1-system-gyp-v8.patch
@@ -1,7 +1,7 @@
-diff -up chromium-6.0.406.0/build/all.gyp.system-v8 chromium-6.0.406.0/build/all.gyp
---- chromium-6.0.406.0/build/all.gyp.system-v8 2010-05-17 04:02:34.000000000 -0400
-+++ chromium-6.0.406.0/build/all.gyp 2010-05-17 10:57:36.581201019 -0400
-@@ -50,7 +50,7 @@
+diff -up chromium-6.0.453.1/build/all.gyp.system-v8 chromium-6.0.453.1/build/all.gyp
+--- chromium-6.0.453.1/build/all.gyp.system-v8 2010-07-02 04:32:41.000000000 -0400
++++ chromium-6.0.453.1/build/all.gyp 2010-07-02 11:42:34.495286188 -0400
+@@ -52,7 +52,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -10,14 +10,13 @@
],
}],
['OS=="mac" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-diff -up chromium-6.0.406.0/build/linux/system.gyp.system-v8 chromium-6.0.406.0/build/linux/system.gyp
---- chromium-6.0.406.0/build/linux/system.gyp.system-v8 2010-05-17 04:02:34.000000000 -0400
-+++ chromium-6.0.406.0/build/linux/system.gyp 2010-05-17 10:56:16.230193214 -0400
-@@ -254,6 +254,18 @@
- },
+diff -up chromium-6.0.453.1/build/linux/system.gyp.system-v8 chromium-6.0.453.1/build/linux/system.gyp
+--- chromium-6.0.453.1/build/linux/system.gyp.system-v8 2010-07-02 04:32:41.000000000 -0400
++++ chromium-6.0.453.1/build/linux/system.gyp 2010-07-02 11:42:34.496281141 -0400
+@@ -256,6 +256,18 @@
}]]
},
-+ {
+ {
+ 'target_name': 'v8',
+ 'type': 'settings',
+ 'conditions': [
@@ -29,13 +28,14 @@
+ },
+ }]]
+ },
- # TODO(evanm): temporarily disabled while we figure out whether to depend
- # on gnome-keyring etc.
- # http://code.google.com/p/chromium/issues/detail?id=12351
-diff -up chromium-6.0.406.0/net/net.gyp.system-v8 chromium-6.0.406.0/net/net.gyp
---- chromium-6.0.406.0/net/net.gyp.system-v8 2010-05-17 04:01:28.000000000 -0400
-+++ chromium-6.0.406.0/net/net.gyp 2010-05-17 10:56:16.276203644 -0400
-@@ -540,7 +540,7 @@
++ {
+ 'target_name': 'gnome-keyring',
+ 'type': 'settings',
+ 'conditions': [
+diff -up chromium-6.0.453.1/net/net.gyp.system-v8 chromium-6.0.453.1/net/net.gyp
+--- chromium-6.0.453.1/net/net.gyp.system-v8 2010-07-02 04:32:11.000000000 -0400
++++ chromium-6.0.453.1/net/net.gyp 2010-07-02 11:42:34.499013647 -0400
+@@ -563,7 +563,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -44,19 +44,19 @@
],
}],
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-diff -up chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
---- chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 2010-05-17 04:23:54.000000000 -0400
-+++ chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp 2010-05-17 10:56:16.281203845 -0400
-@@ -659,7 +659,7 @@
+diff -up chromium-6.0.453.1/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 chromium-6.0.453.1/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
+--- chromium-6.0.453.1/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 2010-07-02 04:39:27.000000000 -0400
++++ chromium-6.0.453.1/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp 2010-07-02 11:47:13.032045851 -0400
+@@ -657,7 +657,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
- }],
- ['enable_svg!=0', {
-@@ -878,10 +878,10 @@
+ 'conditions': [
+ ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+@@ -883,10 +883,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -67,5 +67,5 @@
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
- }],
- ['enable_svg!=0', {
+ 'conditions': [
+ ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
++++++ chromium-6.0.476.0-sharedlibfixes.patch (new)
--- chromium-6.0.476.0-sharedlibfixes.patch
+++ chromium-6.0.476.0-sharedlibfixes.patch
+diff -up chromium-6.0.476.0/chrome/chrome_browser.gypi.sharedlibsfixes chromium-6.0.476.0/chrome/chrome_browser.gypi
+--- chromium-6.0.476.0/chrome/chrome_browser.gypi.sharedlibsfixes 2010-07-26 12:34:12.111920527 -0400
++++ chromium-6.0.476.0/chrome/chrome_browser.gypi 2010-07-26 12:34:12.177907181 -0400
+@@ -23,6 +23,7 @@
+ 'syncapi',
+ 'theme_resources',
+ 'userfeedback_proto',
++ '../native_client/src/trusted/desc/desc.gyp:nrd_xfer',
+ '../app/app.gyp:app_resources',
+ '../app/app.gyp:app_strings',
+ '../media/media.gyp:media',
+@@ -35,6 +36,8 @@
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
++ '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
++ '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+ '../webkit/support/webkit_support.gyp:appcache',
+ '../webkit/support/webkit_support.gyp:database',
+ '../webkit/support/webkit_support.gyp:glue',
+@@ -2855,6 +2858,11 @@
+ '<(grit_out_dir)/grit/theme_resources_map.cc',
+ ],
+ 'conditions': [
++ ['disable_nacl!=1', {
++ 'dependencies': [
++ '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome',
++ ],
++ }],
+ ['javascript_engine=="v8"', {
+ 'defines': [
+ 'CHROME_V8',
+diff -up chromium-6.0.476.0/chrome/chrome_common.gypi.sharedlibsfixes chromium-6.0.476.0/chrome/chrome_common.gypi
+--- chromium-6.0.476.0/chrome/chrome_common.gypi.sharedlibsfixes 2010-07-26 12:34:12.000000000 -0400
++++ chromium-6.0.476.0/chrome/chrome_common.gypi 2010-07-26 12:41:25.361300314 -0400
+@@ -144,6 +144,7 @@
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
++ '../gpu/gpu.gyp:gpu_plugin',
+ '../ipc/ipc.gyp:ipc',
+ '../net/net.gyp:net',
+ '../printing/printing.gyp:printing',
++++++ chromium-6.0.417.0-20100526svn48276.tar.bz2 -> chromium-6.0.486.0-20100805svn55059.tar.bz2
3889464 lines of diff (skipped)
++++++ chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch -> chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
--- chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
+++ chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
@@ -1,6 +1,6 @@
-diff -up chromium-5.0.395.0/base/pr_time_unittest.cc.system-code chromium-5.0.395.0/base/pr_time_unittest.cc
---- chromium-5.0.395.0/base/pr_time_unittest.cc.system-code 2010-05-04 04:17:16.000000000 -0400
-+++ chromium-5.0.395.0/base/pr_time_unittest.cc 2010-05-04 12:57:23.217652231 -0400
+diff -up chromium-6.0.486.0/base/pr_time_unittest.cc.system-code chromium-6.0.486.0/base/pr_time_unittest.cc
+--- chromium-6.0.486.0/base/pr_time_unittest.cc.system-code 2010-08-06 04:36:31.000000000 -0400
++++ chromium-6.0.486.0/base/pr_time_unittest.cc 2010-08-06 10:58:34.976307373 -0400
@@ -4,7 +4,7 @@
#include <time.h>
@@ -10,9 +10,9 @@
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-diff -up chromium-5.0.395.0/base/time.cc.system-code chromium-5.0.395.0/base/time.cc
---- chromium-5.0.395.0/base/time.cc.system-code 2010-05-04 04:17:16.000000000 -0400
-+++ chromium-5.0.395.0/base/time.cc 2010-05-04 12:57:23.219379893 -0400
+diff -up chromium-6.0.486.0/base/time.cc.system-code chromium-6.0.486.0/base/time.cc
+--- chromium-6.0.486.0/base/time.cc.system-code 2010-08-06 04:36:31.000000000 -0400
++++ chromium-6.0.486.0/base/time.cc 2010-08-06 10:58:34.977301820 -0400
@@ -5,7 +5,7 @@
#include "base/time.h"
#include "base/string_util.h"
@@ -22,10 +22,10 @@
#include "base/logging.h"
-diff -up chromium-5.0.395.0/chrome/browser/browser_about_handler.cc.system-code chromium-5.0.395.0/chrome/browser/browser_about_handler.cc
---- chromium-5.0.395.0/chrome/browser/browser_about_handler.cc.system-code 2010-05-04 04:18:04.000000000 -0400
-+++ chromium-5.0.395.0/chrome/browser/browser_about_handler.cc 2010-05-04 12:57:23.262275199 -0400
-@@ -50,7 +50,7 @@
+diff -up chromium-6.0.486.0/chrome/browser/browser_about_handler.cc.system-code chromium-6.0.486.0/chrome/browser/browser_about_handler.cc
+--- chromium-6.0.486.0/chrome/browser/browser_about_handler.cc.system-code 2010-08-06 04:37:22.000000000 -0400
++++ chromium-6.0.486.0/chrome/browser/browser_about_handler.cc 2010-08-06 10:58:34.980298377 -0400
+@@ -54,7 +54,7 @@
#include "grit/locale_settings.h"
#include "webkit/glue/webkit_glue.h"
#ifdef CHROME_V8
@@ -34,9 +34,9 @@
#endif
#if defined(OS_WIN)
-diff -up chromium-5.0.395.0/chrome/browser/memory_purger.cc.system-code chromium-5.0.395.0/chrome/browser/memory_purger.cc
---- chromium-5.0.395.0/chrome/browser/memory_purger.cc.system-code 2010-05-04 04:18:04.000000000 -0400
-+++ chromium-5.0.395.0/chrome/browser/memory_purger.cc 2010-05-04 13:03:50.748174592 -0400
+diff -up chromium-6.0.486.0/chrome/browser/memory_purger.cc.system-code chromium-6.0.486.0/chrome/browser/memory_purger.cc
+--- chromium-6.0.486.0/chrome/browser/memory_purger.cc.system-code 2010-08-06 04:37:22.000000000 -0400
++++ chromium-6.0.486.0/chrome/browser/memory_purger.cc 2010-08-06 10:58:34.981297675 -0400
@@ -23,7 +23,7 @@
#include "net/proxy/proxy_resolver.h"
#include "net/url_request/url_request_context.h"
@@ -46,9 +46,9 @@
// PurgeMemoryHelper -----------------------------------------------------------
-diff -up chromium-5.0.395.0/chrome/common/zip.cc.system-code chromium-5.0.395.0/chrome/common/zip.cc
---- chromium-5.0.395.0/chrome/common/zip.cc.system-code 2010-05-04 04:18:05.000000000 -0400
-+++ chromium-5.0.395.0/chrome/common/zip.cc 2010-05-04 12:57:23.277283136 -0400
+diff -up chromium-6.0.486.0/chrome/common/zip.cc.system-code chromium-6.0.486.0/chrome/common/zip.cc
+--- chromium-6.0.486.0/chrome/common/zip.cc.system-code 2010-08-06 04:37:25.000000000 -0400
++++ chromium-6.0.486.0/chrome/common/zip.cc 2010-08-06 10:58:34.983308168 -0400
@@ -9,8 +9,8 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -60,22 +60,22 @@
#if defined(OS_WIN)
#include "third_party/zlib/contrib/minizip/iowin32.h"
#endif
-diff -up chromium-5.0.395.0/chrome/renderer/automation/dom_automation_v8_extension.h.system-code chromium-5.0.395.0/chrome/renderer/automation/dom_automation_v8_extension.h
---- chromium-5.0.395.0/chrome/renderer/automation/dom_automation_v8_extension.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/automation/dom_automation_v8_extension.h 2010-05-04 12:57:23.279272933 -0400
-@@ -5,7 +5,7 @@
- #ifndef CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_V8_EXTENSION_H_
+diff -up chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_extension.h.system-code chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_extension.h
+--- chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_extension.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_extension.h 2010-08-06 11:09:21.862120081 -0400
+@@ -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:
-diff -up chromium-5.0.395.0/chrome/renderer/extensions/bindings_utils.h.system-code chromium-5.0.395.0/chrome/renderer/extensions/bindings_utils.h
---- chromium-5.0.395.0/chrome/renderer/extensions/bindings_utils.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/extensions/bindings_utils.h 2010-05-04 12:57:23.281274066 -0400
-@@ -9,7 +9,7 @@
+diff -up chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h.system-code chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h
+--- chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h 2010-08-06 10:58:34.984300170 -0400
+@@ -10,7 +10,7 @@
#include "base/linked_ptr.h"
#include "base/singleton.h"
#include "base/string_piece.h"
@@ -84,10 +84,10 @@
#include <list>
#include <string>
-diff -up chromium-5.0.395.0/chrome/renderer/extensions/event_bindings.h.system-code chromium-5.0.395.0/chrome/renderer/extensions/event_bindings.h
---- chromium-5.0.395.0/chrome/renderer/extensions/event_bindings.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/extensions/event_bindings.h 2010-05-04 12:57:23.283275412 -0400
-@@ -7,7 +7,7 @@
+diff -up chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h.system-code chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h
+--- chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h 2010-08-06 10:58:34.985293228 -0400
+@@ -8,7 +8,7 @@
#include <string>
@@ -96,10 +96,10 @@
class GURL;
class RenderThreadBase;
-diff -up chromium-5.0.395.0/chrome/renderer/extensions/extension_process_bindings.h.system-code chromium-5.0.395.0/chrome/renderer/extensions/extension_process_bindings.h
---- chromium-5.0.395.0/chrome/renderer/extensions/extension_process_bindings.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/extensions/extension_process_bindings.h 2010-05-04 12:57:23.284287618 -0400
-@@ -12,7 +12,7 @@
+diff -up chromium-6.0.486.0/chrome/renderer/extensions/extension_process_bindings.h.system-code chromium-6.0.486.0/chrome/renderer/extensions/extension_process_bindings.h
+--- chromium-6.0.486.0/chrome/renderer/extensions/extension_process_bindings.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/extensions/extension_process_bindings.h 2010-08-06 10:58:34.993044553 -0400
+@@ -13,7 +13,7 @@
#include <vector>
#include "chrome/common/view_types.h"
@@ -108,33 +108,45 @@
class GURL;
class URLPattern;
-diff -up chromium-5.0.395.0/chrome/renderer/extensions/js_only_v8_extensions.h.system-code chromium-5.0.395.0/chrome/renderer/extensions/js_only_v8_extensions.h
---- chromium-5.0.395.0/chrome/renderer/extensions/js_only_v8_extensions.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/extensions/js_only_v8_extensions.h 2010-05-04 12:57:23.286260764 -0400
-@@ -5,7 +5,7 @@
- #ifndef CHROME_RENDERER_EXTENSIONS_JS_ONLY_V8_EXTENSIONS_H_
+diff -up chromium-6.0.486.0/chrome/renderer/extensions/js_only_v8_extensions.h.system-code chromium-6.0.486.0/chrome/renderer/extensions/js_only_v8_extensions.h
+--- chromium-6.0.486.0/chrome/renderer/extensions/js_only_v8_extensions.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/extensions/js_only_v8_extensions.h 2010-08-06 11:09:49.958009722 -0400
+@@ -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.
-diff -up chromium-5.0.395.0/chrome/renderer/extensions/renderer_extension_bindings.h.system-code chromium-5.0.395.0/chrome/renderer/extensions/renderer_extension_bindings.h
---- chromium-5.0.395.0/chrome/renderer/extensions/renderer_extension_bindings.h.system-code 2010-05-04 04:18:06.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/extensions/renderer_extension_bindings.h 2010-05-04 12:57:23.288264278 -0400
-@@ -5,7 +5,7 @@
- #ifndef CHROME_RENDERER_EXTENSIONS_RENDERER_EXTENSION_BINDINGS_H_
+diff -up chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_bindings.h.system-code chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_bindings.h
+--- chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_bindings.h.system-code 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_bindings.h 2010-08-06 11:10:13.218922957 -0400
+@@ -6,7 +6,7 @@
#define CHROME_RENDERER_EXTENSIONS_RENDERER_EXTENSION_BINDINGS_H_
+ #pragma once
-#include "v8/include/v8.h"
+#include <v8.h>
#include <string>
-diff -up chromium-5.0.395.0/chrome/renderer/loadtimes_extension_bindings.cc.system-code chromium-5.0.395.0/chrome/renderer/loadtimes_extension_bindings.cc
---- chromium-5.0.395.0/chrome/renderer/loadtimes_extension_bindings.cc.system-code 2010-05-04 04:18:07.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/loadtimes_extension_bindings.cc 2010-05-04 12:57:23.290277521 -0400
+diff -up chromium-6.0.486.0/chrome/renderer/external_extension.cc.system-code chromium-6.0.486.0/chrome/renderer/external_extension.cc
+--- chromium-6.0.486.0/chrome/renderer/external_extension.cc.system-code 2010-08-06 11:11:15.901309499 -0400
++++ chromium-6.0.486.0/chrome/renderer/external_extension.cc 2010-08-06 11:11:28.709169087 -0400
+@@ -8,7 +8,7 @@
+ #include "chrome/common/chrome_switches.h"
+ #include "chrome/renderer/render_view.h"
+ #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using WebKit::WebFrame;
+ using WebKit::WebView;
+diff -up chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc.system-code chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc
+--- chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc.system-code 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc 2010-08-06 10:58:35.012918653 -0400
@@ -9,7 +9,7 @@
#include "base/time.h"
#include "chrome/renderer/navigation_state.h"
@@ -144,10 +156,10 @@
using WebKit::WebDataSource;
using WebKit::WebFrame;
-diff -up chromium-5.0.395.0/chrome/renderer/render_thread.cc.system-code chromium-5.0.395.0/chrome/renderer/render_thread.cc
---- chromium-5.0.395.0/chrome/renderer/render_thread.cc.system-code 2010-05-04 04:18:07.000000000 -0400
-+++ chromium-5.0.395.0/chrome/renderer/render_thread.cc 2010-05-04 12:57:23.293272064 -0400
-@@ -79,7 +79,7 @@
+diff -up chromium-6.0.486.0/chrome/renderer/render_thread.cc.system-code chromium-6.0.486.0/chrome/renderer/render_thread.cc
+--- chromium-6.0.486.0/chrome/renderer/render_thread.cc.system-code 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/render_thread.cc 2010-08-06 10:58:35.014927089 -0400
+@@ -84,7 +84,7 @@
#include "webkit/extensions/v8/gears_extension.h"
(237 more lines skipped)
++++++ chromium-6.0.486.0-gyp-system-icu.patch (new)
--- chromium-6.0.486.0-gyp-system-icu.patch
+++ chromium-6.0.486.0-gyp-system-icu.patch
+diff -up chromium-6.0.486.0/app/app_base.gypi.system-icu chromium-6.0.486.0/app/app_base.gypi
+--- chromium-6.0.486.0/app/app_base.gypi.system-icu 2010-08-06 04:35:13.000000000 -0400
++++ chromium-6.0.486.0/app/app_base.gypi 2010-08-06 12:07:05.065283667 -0400
+@@ -74,8 +74,7 @@
+ '../gfx/gfx.gyp:gfx',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../third_party/libpng/libpng.gyp:libpng',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+diff -up chromium-6.0.486.0/app/app.gyp.system-icu chromium-6.0.486.0/app/app.gyp
+--- chromium-6.0.486.0/app/app.gyp.system-icu 2010-08-06 04:35:13.000000000 -0400
++++ chromium-6.0.486.0/app/app.gyp 2010-08-06 12:07:05.066602534 -0400
+@@ -30,8 +30,7 @@
+ '../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../third_party/libpng/libpng.gyp:libpng',
+ '../third_party/zlib/zlib.gyp:zlib',
+diff -up chromium-6.0.486.0/base/base.gyp.system-icu chromium-6.0.486.0/base/base.gyp
+--- chromium-6.0.486.0/base/base.gyp.system-icu 2010-08-06 04:36:31.000000000 -0400
++++ chromium-6.0.486.0/base/base.gyp 2010-08-06 12:07:05.067037168 -0400
+@@ -16,8 +16,7 @@
+ 'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
+ 'dependencies': [
+ 'base',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ ],
+ 'conditions': [
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+@@ -164,7 +163,7 @@
+ 'include_dirs': [
+ # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
+ # #include for unicode/uchar.h. This should probably be cleaned up.
+- '../third_party/icu/public/common',
++ # '../third_party/icu/public/common',
+ ],
+ 'dependencies': [
+ 'base',
+diff -up chromium-6.0.486.0/build/all.gyp.system-icu chromium-6.0.486.0/build/all.gyp
+--- chromium-6.0.486.0/build/all.gyp.system-icu 2010-08-06 12:07:05.035055579 -0400
++++ chromium-6.0.486.0/build/all.gyp 2010-08-06 12:07:05.068255000 -0400
+@@ -31,7 +31,6 @@
+ '../third_party/cld/cld.gyp:*',
+ '../third_party/codesighs/codesighs.gyp:*',
+ '../third_party/ffmpeg/ffmpeg.gyp:*',
+- '../third_party/icu/icu.gyp:*',
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ '../third_party/libpng/libpng.gyp:*',
+ '../third_party/libxml/libxml.gyp:*',
+diff -up chromium-6.0.486.0/build/linux/system.gyp.system-icu chromium-6.0.486.0/build/linux/system.gyp
+--- chromium-6.0.486.0/build/linux/system.gyp.system-icu 2010-08-06 12:07:05.036050692 -0400
++++ chromium-6.0.486.0/build/linux/system.gyp 2010-08-06 12:07:05.069046653 -0400
+@@ -268,6 +268,26 @@
+ }]]
+ },
+ {
++ 'target_name': 'icu',
++ 'type': 'settings',
++ 'conditions': [
++ ['_toolset=="target"', {
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags icu)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other icu)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l icu)',
++ ],
++ },
++ }]]
++ },
++ {
+ 'target_name': 'gnome-keyring',
+ 'type': 'settings',
+ 'conditions': [
+diff -up chromium-6.0.486.0/build/temp_gyp/googleurl.gyp.system-icu chromium-6.0.486.0/build/temp_gyp/googleurl.gyp
+--- chromium-6.0.486.0/build/temp_gyp/googleurl.gyp.system-icu 2010-08-06 04:36:18.000000000 -0400
++++ chromium-6.0.486.0/build/temp_gyp/googleurl.gyp 2010-08-06 12:07:05.070050482 -0400
+@@ -14,9 +14,7 @@
+ 'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+- '../../third_party/icu/icu.gyp:icudata',
+- '../../third_party/icu/icu.gyp:icui18n',
+- '../../third_party/icu/icu.gyp:icuuc',
++ '../../build/linux/system.gyp:icu',
+ ],
+ 'sources': [
+ '../../googleurl/src/gurl.cc',
+@@ -71,7 +69,7 @@
+ 'dependencies': [
+ 'googleurl',
+ '../../testing/gtest.gyp:gtest',
+- '../../third_party/icu/icu.gyp:icuuc',
++ '../../build/linux/system.gyp:icu',
+ ],
+ 'sources': [
+ '../../googleurl/src/gurl_unittest.cc',
+diff -up chromium-6.0.486.0/chrome/chrome_browser.gypi.system-icu chromium-6.0.486.0/chrome/chrome_browser.gypi
+--- chromium-6.0.486.0/chrome/chrome_browser.gypi.system-icu 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/chrome_browser.gypi 2010-08-06 12:07:05.073045357 -0400
+@@ -30,8 +30,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/bzip2/bzip2.gyp:bzip2',
+ '../third_party/expat/expat.gyp:expat',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/npapi/npapi.gyp:npapi',
+diff -up chromium-6.0.486.0/chrome/chrome_common.gypi.system-icu chromium-6.0.486.0/chrome/chrome_common.gypi
+--- chromium-6.0.486.0/chrome/chrome_common.gypi.system-icu 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/chrome_common.gypi 2010-08-06 12:07:05.074045011 -0400
+@@ -149,8 +149,7 @@
+ '../printing/printing.gyp:printing',
+ '../skia/skia.gyp:skia',
+ '../third_party/bzip2/bzip2.gyp:bzip2',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ '../third_party/zlib/zlib.gyp:zlib',
+diff -up chromium-6.0.486.0/chrome/chrome.gyp.system-icu chromium-6.0.486.0/chrome/chrome.gyp
+--- chromium-6.0.486.0/chrome/chrome.gyp.system-icu 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/chrome.gyp 2010-08-06 12:07:05.075043762 -0400
+@@ -527,8 +527,7 @@
+ '../net/net.gyp:http_listen_socket',
+ 'theme_resources',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ ],
+ 'include_dirs': [
+ '..',
+@@ -578,8 +577,7 @@
+ 'chrome_strings',
+ '../media/media.gyp:media',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/support/webkit_support.gyp:glue',
+@@ -823,7 +821,7 @@
+ '../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../jingle/jingle.gyp:notifier',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+diff -up chromium-6.0.486.0/chrome/chrome_renderer.gypi.system-icu chromium-6.0.486.0/chrome/chrome_renderer.gypi
+--- chromium-6.0.486.0/chrome/chrome_renderer.gypi.system-icu 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/chrome_renderer.gypi 2010-08-06 12:07:05.076044224 -0400
+@@ -18,8 +18,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../third_party/cld/cld.gyp:cld',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+ '../webkit/support/webkit_support.gyp:glue',
+diff -up chromium-6.0.486.0/chrome/chrome_tests.gypi.system-icu chromium-6.0.486.0/chrome/chrome_tests.gypi
+--- chromium-6.0.486.0/chrome/chrome_tests.gypi.system-icu 2010-08-06 04:37:27.000000000 -0400
++++ chromium-6.0.486.0/chrome/chrome_tests.gypi 2010-08-06 12:07:05.078040977 -0400
+@@ -272,8 +272,7 @@
+ '../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libxml/libxml.gyp:libxml',
+ # run time dependencies
+ 'default_plugin/default_plugin.gyp:default_plugin',
+@@ -566,8 +565,7 @@
+ '../net/net.gyp:net',
(283 more lines skipped)
++++++ chromium-6.0.486.0-icu-code-changes.patch (new)
--- chromium-6.0.486.0-icu-code-changes.patch
+++ chromium-6.0.486.0-icu-code-changes.patch
+diff -up chromium-6.0.486.0/chrome/browser/autocomplete/autocomplete_popup_model.cc.icu chromium-6.0.486.0/chrome/browser/autocomplete/autocomplete_popup_model.cc
+--- chromium-6.0.486.0/chrome/browser/autocomplete/autocomplete_popup_model.cc.icu 2010-08-06 04:37:18.000000000 -0400
++++ chromium-6.0.486.0/chrome/browser/autocomplete/autocomplete_popup_model.cc 2010-08-06 12:22:45.522348367 -0400
+@@ -12,7 +12,7 @@
+ #include "chrome/browser/search_engines/template_url.h"
+ #include "chrome/browser/search_engines/template_url_model.h"
+ #include "chrome/common/notification_service.h"
+-#include "third_party/icu/public/common/unicode/ubidi.h"
++#include <unicode/ubidi.h>
+
+ ///////////////////////////////////////////////////////////////////////////////
+ // AutocompletePopupModel
+diff -up chromium-6.0.486.0/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc.icu chromium-6.0.486.0/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+--- chromium-6.0.486.0/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc.icu 2010-08-06 04:37:18.000000000 -0400
++++ chromium-6.0.486.0/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc 2010-08-06 12:22:45.522348367 -0400
+@@ -22,7 +22,7 @@
+ #include "grit/generated_resources.h"
+ #include "grit/theme_resources.h"
+ #include "third_party/skia/include/core/SkShader.h"
+-#include "third_party/icu/public/common/unicode/ubidi.h"
++#include <unicode/ubidi.h>
+ #include "views/widget/widget.h"
+
+ #if defined(OS_WIN)
+diff -up chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.cc.icu chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.cc
+--- chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.cc.icu 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.cc 2010-08-06 12:23:58.171172541 -0400
+@@ -14,10 +14,10 @@
+ #include "base/string_util.h"
+ #include "base/utf_string_conversions.h"
+ #include "chrome/renderer/spellchecker/spellcheck.h"
+-#include "third_party/icu/public/common/unicode/normlzr.h"
+-#include "third_party/icu/public/common/unicode/schriter.h"
+-#include "third_party/icu/public/common/unicode/uscript.h"
+-#include "third_party/icu/public/i18n/unicode/ulocdata.h"
++#include <unicode/normlzr.h>
++#include <unicode/schriter.h>
++#include <unicode/uscript.h>
++#include <unicode/ulocdata.h>
+
+ // SpellcheckCharAttribute implementation:
+
+diff -up chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.h.icu chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.h
+--- chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.h.icu 2010-08-06 04:37:26.000000000 -0400
++++ chromium-6.0.486.0/chrome/renderer/spellchecker/spellcheck_worditerator.h 2010-08-06 12:22:45.522348367 -0400
+@@ -15,8 +15,8 @@
+
+ #include "base/basictypes.h"
+ #include "base/string16.h"
+-#include "third_party/icu/public/common/unicode/ubrk.h"
+-#include "third_party/icu/public/common/unicode/uscript.h"
++#include <unicode/ubrk.h>
++#include <unicode/uscript.h>
+
+ // A class which encapsulates language-specific operations used by
+ // SpellcheckWordIterator. When we set the spellchecker language, this class
+diff -up chromium-6.0.486.0/skia/ext/SkFontHost_fontconfig_direct.cpp.icu chromium-6.0.486.0/skia/ext/SkFontHost_fontconfig_direct.cpp
+--- chromium-6.0.486.0/skia/ext/SkFontHost_fontconfig_direct.cpp.icu 2010-08-06 04:35:34.000000000 -0400
++++ chromium-6.0.486.0/skia/ext/SkFontHost_fontconfig_direct.cpp 2010-08-06 12:22:45.537969220 -0400
+@@ -22,7 +22,7 @@
+
+ #include <fontconfig/fontconfig.h>
+
+-#include "third_party/icu/public/common/unicode/utf16.h"
++#include <unicode/utf16.h>
+
+ namespace {
+
++++++ chromium-browser-window-focus.patch
--- chromium-browser-window-focus.patch
+++ chromium-browser-window-focus.patch
@@ -1,11 +1,11 @@
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
-index 6912e25..6047cdd 100644
+index 4d0d11f..2370ff6 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
-@@ -453,6 +453,15 @@ bool UpdateWindowFunction::RunImpl() {
+@@ -433,6 +433,15 @@ bool UpdateWindowFunction::RunImpl() {
+ }
browser->window()->SetBounds(bounds);
- // TODO(rafaelw): Support |focused|.
+
+ if (update_props->HasKey(keys::kFocusedKey)) {
+ bool focused = false;
@@ -19,10 +19,10 @@
return true;
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
-index b07e66f..db3130d 100644
+index a7288e6..ca9c84e 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
-@@ -626,6 +626,9 @@ void BrowserWindowGtk::Show() {
+@@ -641,6 +641,9 @@ void BrowserWindowGtk::Show() {
// area, then undo it so that the render view can later adjust its own
// size.
gtk_widget_set_size_request(contents_container_->widget(), -1, -1);
@@ -32,7 +32,7 @@
}
void BrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds, bool exterior) {
-@@ -690,6 +693,8 @@ void BrowserWindowGtk::Close() {
+@@ -708,6 +711,8 @@ void BrowserWindowGtk::Close() {
void BrowserWindowGtk::Activate() {
gtk_window_present(window_);
@@ -42,10 +42,10 @@
bool BrowserWindowGtk::IsActive() const {
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
-index 5db6983..c5ea7c7 100644
+index a143e8c..e9f920f 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
-@@ -631,7 +631,8 @@
+@@ -638,7 +638,8 @@
"left": {"type": "integer", "optional": true, "description": "The offset from the left edge of the screen to move the window to in pixels."},
"top": {"type": "integer", "optional": true, "description": "The offset from the top edge of the screen to move the window to in pixels."},
"width": {"type": "integer", "minimum": 0, "optional": true, "description": "The width to resize the window to in pixels."},
++++++ chromium-expose-chromium-browser-api.patch (new)
--- chromium-expose-chromium-browser-api.patch
+++ chromium-expose-chromium-browser-api.patch
+diff --git a/app/l10n_util.cc b/app/l10n_util.cc
+index 1ec4b19..82d3301 100644
+--- a/app/l10n_util.cc
++++ b/app/l10n_util.cc
+@@ -367,9 +367,14 @@ void SplitAndNormalizeLanguageList(const std::string& env_language,
+ namespace l10n_util {
+
+ std::string GetApplicationLocale(const std::string& pref_locale) {
+-#if !defined(OS_MACOSX)
+ FilePath locale_path;
+ PathService::Get(app::DIR_LOCALES, &locale_path);
++ return GetApplicationLocale(ASCIIToWide(pref_locale), locale_path);
++}
++
++std::string GetApplicationLocale(const std::wstring& pref_locale,
++ FilePath& locale_path) {
++#if !defined(OS_MACOSX)
+ std::string resolved_locale;
+ std::vector<std::string> candidates;
+ const std::string system_locale = GetSystemLocale();
+diff --git a/app/l10n_util.h b/app/l10n_util.h
+index 4bc3ba8..0e4eeef 100644
+--- a/app/l10n_util.h
++++ b/app/l10n_util.h
+@@ -21,6 +21,7 @@
+ #include "base/scoped_ptr.h"
+ #include "base/string16.h"
+ #include "base/string_util.h"
++#include "base/file_path.h"
+
+ #if defined(OS_MACOSX)
+ #include "app/l10n_util_mac.h"
+@@ -41,6 +42,9 @@ namespace l10n_util {
+ // we fall back to en-us.
+ std::string GetApplicationLocale(const std::string& pref_locale);
+
++std::string GetApplicationLocale(const std::wstring& pref_locale,
++ FilePath& locale_path);
++
+ // Given a locale code, return true if the OS is capable of supporting it.
+ // For instance, Oriya is not well supported on Windows XP and we return
+ // false for "or".
+diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
+index 25b0d81..d99f0de 100644
+--- a/app/resource_bundle.cc
++++ b/app/resource_bundle.cc
+@@ -60,6 +60,17 @@ void ResourceBundle::AddDataPackToSharedInstance(const FilePath& path) {
+ g_shared_instance_->data_packs_.push_back(new LoadedDataPack(path));
+ }
+
++std::string ResourceBundle::InitSharedInstance(
++ const std::wstring& pref_locale,
++ FilePath& bundle_path,
++ FilePath& locale_path) {
++ DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
++ g_shared_instance_ = new ResourceBundle();
++
++ g_shared_instance_->LoadCommonResources(bundle_path);
++ return g_shared_instance_->LoadLocaleResources(pref_locale, locale_path);
++}
++
+ /* static */
+ void ResourceBundle::CleanupSharedInstance() {
+ if (g_shared_instance_) {
+diff --git a/app/resource_bundle.h b/app/resource_bundle.h
+index 49ca359..98ba97c 100644
+--- a/app/resource_bundle.h
++++ b/app/resource_bundle.h
+@@ -84,6 +84,10 @@ class ResourceBundle {
+ // immediately after calling InitSharedInstance.
+ static void AddDataPackToSharedInstance(const FilePath& path);
+
++ static std::string InitSharedInstance(const std::wstring& pref_locale,
++ FilePath& bundle_path,
++ FilePath& locale_path);
++
+ // Delete the ResourceBundle for this process if it exists.
+ static void CleanupSharedInstance();
+
+@@ -197,10 +201,12 @@ class ResourceBundle {
+
+ // Load the main resources.
+ void LoadCommonResources();
+-
++ void LoadCommonResources(FilePath& resources_file_path);
++
+ // Try to load the locale specific strings from an external data module.
+ // Returns the locale that is loaded.
+ std::string LoadLocaleResources(const std::string& pref_locale);
++ std::string LoadLocaleResources(const std::wstring& pref_locale, FilePath& locale_dir_path);
+
+ // Unload the locale specific strings and prepares to load new ones. See
+ // comments for ReloadSharedInstance().
+@@ -219,6 +225,9 @@ class ResourceBundle {
+ // string if no locale data files are found.
+ static FilePath GetLocaleFilePath(const std::string& app_locale);
+
++ static FilePath GetLocaleFilePath(const std::string& app_locale,
++ FilePath& locale_path);
++
+ // Returns a handle to bytes from the resource |module|, without doing any
+ // processing or interpretation of the resource. Returns whether we
+ // successfully read the resource. Caller does not own the data returned
+diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
+index 55bf2ad..3eb4ace 100644
+--- a/app/resource_bundle_linux.cc
++++ b/app/resource_bundle_linux.cc
+@@ -85,6 +85,19 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
+ return locale_file_path;
+ }
+
++// static
++FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
++ FilePath& locale_path) {
++ if (locale_path.empty())
++ return locale_path;
++ if (app_locale.empty())
++ return FilePath();
++ locale_path = locale_path.AppendASCII(app_locale + ".pak");
++ if (!file_util::PathExists(locale_path))
++ return FilePath();
++ return locale_path;
++}
++
+ GdkPixbuf* ResourceBundle::GetPixbufImpl(int resource_id, bool rtl_enabled) {
+ // Use the negative |resource_id| for the key for BIDI-aware images.
+ int key = rtl_enabled ? -resource_id : resource_id;
+diff --git a/app/resource_bundle_posix.cc b/app/resource_bundle_posix.cc
+index 9944280..9900fbd 100644
+--- a/app/resource_bundle_posix.cc
++++ b/app/resource_bundle_posix.cc
+@@ -101,6 +101,12 @@ void ResourceBundle::LoadCommonResources() {
+ CHECK(resources_data_) << "failed to load chrome.pak";
+ }
+
++void ResourceBundle::LoadCommonResources(FilePath& resources_file_path) {
++ CHECK(!resources_file_path.empty()) << "chrome.pak not found";
++ resources_data_ = LoadResourcesDataPak(resources_file_path);
++ CHECK(resources_data_) << "failed to load chrome.pak";
++}
++
+ std::string ResourceBundle::LoadLocaleResources(
+ const std::string& pref_locale) {
+ DCHECK(!locale_resources_data_) << "locale.pak already loaded";
+@@ -115,3 +121,19 @@ std::string ResourceBundle::LoadLocaleResources(
+ CHECK(locale_resources_data_) << "failed to load locale.pak";
+ return app_locale;
+ }
++
++std::string ResourceBundle::LoadLocaleResources(
++ const std::wstring& pref_locale,
++ FilePath& locale_dir_path) {
++ DCHECK(!locale_resources_data_) << "locale.pak already loaded";
++ std::string app_locale = l10n_util::GetApplicationLocale(pref_locale, locale_dir_path);
++ FilePath locale_file_path = GetLocaleFilePath(app_locale, locale_dir_path);
++ if (locale_file_path.empty()) {
++ // It's possible that there is no locale.pak.
++ NOTREACHED();
++ return std::string();
++ }
++ locale_resources_data_ = LoadResourcesDataPak(locale_file_path);
++ CHECK(locale_resources_data_) << "failed to load locale.pak";
++ return app_locale;
++}
+diff --git a/build/common.gypi b/build/common.gypi
+index 3026274..80c5dc4 100644
+--- a/build/common.gypi
++++ b/build/common.gypi
+@@ -67,7 +67,7 @@
+ # or you can add the following line (without the #) to
+ # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
+ # to compile as shared by default
+- 'library%': 'static_library',
++ 'library%': 'shared_library',
+ },
+
+ # Set default value of toolkit_views on for Windows and Chrome OS.
+diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
+index 417d333..9c34ad8 100644
+--- a/chrome/browser/browser_process.h
++++ b/chrome/browser/browser_process.h
+@@ -95,6 +95,7 @@ class BrowserProcess {
+ // Returns the thread that is used for background cache operations.
+ virtual base::Thread* cache_thread() = 0;
+
++ virtual base::Thread* process_launcher_thread() = 0;
+ #if defined(USE_X11)
+ // Returns the thread that is used to process UI requests in cases where
+ // we can't route the request to the UI thread. Note that this thread
+diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc
+index c06f811..6e3e1c5 100644
+--- a/chrome/browser/sessions/session_backend.cc
++++ b/chrome/browser/sessions/session_backend.cc
+@@ -18,64 +18,6 @@ static const int32 kFileCurrentVersion = 1;
+ // The signature at the beginning of the file = SSNS (Sessions).
+ static const int32 kFileSignature = 0x53534E53;
+
+-namespace {
(142 more lines skipped)
++++++ chromium-fix-gcc-4.5-build-errors.patch
--- chromium-fix-gcc-4.5-build-errors.patch
+++ chromium-fix-gcc-4.5-build-errors.patch
@@ -1,34 +1,57 @@
-diff -Nur chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_device_context_2d.cc chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_device_context_2d.cc
---- chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_device_context_2d.cc 2010-05-26 23:53:34.000000000 +0800
-+++ chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_device_context_2d.cc 2010-07-21 12:47:46.597572869 +0800
-@@ -61,11 +61,11 @@
- bool is_always_opaque) {
- PluginModule* module = PluginModule::FromPPModule(module_id);
- if (!module)
-- return NULL;
-+ return 0;
+Index: third_party/ppapi/cpp/resource.cc
+===================================================================
+--- third_party/ppapi/cpp/resource.cc (revision 169)
++++ third_party/ppapi/cpp/resource.cc (working copy)
+@@ -11,7 +11,7 @@
- scoped_refptr<DeviceContext2D> context(new DeviceContext2D(module));
- if (!context->Init(width, height, is_always_opaque))
-- return NULL;
-+ return 0;
- context->AddRef(); // AddRef for the caller.
- return context->GetResource();
+ namespace pp {
+
+-Resource::Resource() : pp_resource_(NULL) {
++Resource::Resource() : pp_resource_(0) {
+ }
+
+ Resource::Resource(const Resource& other) : pp_resource_(other.pp_resource_) {
+@@ -36,7 +36,7 @@
+
+ PP_Resource Resource::detach() {
+ PP_Resource ret = pp_resource_;
+- pp_resource_ = NULL;
++ pp_resource_ = 0;
+ return ret;
+ }
+
+Index: third_party/ppapi/cpp/module.cc
+===================================================================
+--- third_party/ppapi/cpp/module.cc (revision 169)
++++ third_party/ppapi/cpp/module.cc (working copy)
+@@ -311,7 +311,7 @@
+
+ // Module ----------------------------------------------------------------------
+
+-Module::Module() : pp_module_(NULL), get_browser_interface_(NULL), core_(NULL) {
++Module::Module() : pp_module_(0), get_browser_interface_(NULL), core_(NULL) {
}
-diff -Nur chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_image_data.cc chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_image_data.cc
---- chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_image_data.cc 2010-05-26 23:53:34.000000000 +0800
-+++ chromium-fix-gcc-4.5/webkit/glue/plugins/pepper_image_data.cc 2010-07-21 12:48:23.250950798 +0800
-@@ -40,11 +40,11 @@
- bool init_to_zero) {
+
+ Module::~Module() {
+
+Index: webkit/glue/plugins/pepper_private.cc
+===================================================================
+--- webkit/glue/plugins/pepper_private.cc 2010-08-06 16:35:14.000000000 +0800
++++ webkit/glue/plugins/pepper_private.cc 2010-09-01 15:48:35.384397203 +0800
+@@ -49,14 +49,14 @@
+ #if defined(OS_LINUX)
PluginModule* module = PluginModule::FromPPModule(module_id);
if (!module)
- return NULL;
+ return 0;
- scoped_refptr<ImageData> data(new ImageData(module));
- if (!data->Init(format, width, height, init_to_zero))
+ int fd = webkit_glue::MatchFontWithFallback(description->face,
+ description->weight >= 700,
+ description->italic,
+ description->charset);
+ if (fd == -1)
- return NULL;
+ return 0;
- data->AddRef(); // AddRef for the caller.
- return data->GetResource();
+ scoped_refptr<PrivateFontFile> font(new PrivateFontFile(module, fd));
+
++++++ webkit-complex-font-selection-fix.patch (new)
--- webkit-complex-font-selection-fix.patch
+++ webkit-complex-font-selection-fix.patch
+diff --git a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+index 53f4a52..004b38e 100644
+--- a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
++++ b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+@@ -54,16 +54,44 @@ void FontCache::platformInit()
+ {
+ }
+
+-const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
+- const UChar* characters,
+- int length)
++typedef HashMap<String, SkTypeface*> TypefaceCache;
++
++const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length)
+ {
+- String family = ChromiumBridge::getFontFamilyForCharacters(characters, length);
+- if (family.isEmpty())
++ int style = SkTypeface::kNormal;
++ if (font.fontDescription().weight() >= FontWeightBold)
++ style |= SkTypeface::kBold;
++ if (font.fontDescription().italic())
++ style |= SkTypeface::kItalic;
++
++ static TypefaceCache *gTypefaceChache = 0;
++ if (!gTypefaceChache)
++ gTypefaceChache = new TypefaceCache;
++
++ SkTypeface* tf = 0;
++
++ String key(characters, length);
++ key.append(static_cast<UChar>(style));
++ TypefaceCache::iterator it = gTypefaceChache->find(key);
++ if (it != gTypefaceChache->end())
++ tf = it->second;
++ else {
++ tf = SkTypeface::CreateForChars(characters, length * 2,
++ static_cast<SkTypeface::Style>(style));
++ gTypefaceChache->set(key, tf);
++ }
++ if (!tf)
+ return 0;
+
+- AtomicString atomicFamily(family);
+- return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, false));
++ // FIXME: we don't have a family name for this font.
++ // However, the family name within FontPlatformData is only used when picking
++ // a render style for the font, so it's not too great of a loss.
++ FontPlatformData result(tf,
++ "",
++ font.fontDescription().computedSize(),
++ (style & SkTypeface::kBold) && !tf->isBold(),
++ (style & SkTypeface::kItalic) && !tf->isItalic());
++ return getCachedFontData(&result);
+ }
+
+ SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font)
++++++ deleted files:
--- chromium-20100315-shared-chromiumthreading.patch
--- chromium-20100506-expose-chromium-browser-api.patch
--- chromium-5.0.395.0-icu-code-changes.patch
--- chromium-6.0.406.0-sharedlibfixes.patch
--- chromium-6.0.417.0-gyp-system-icu.patch
--- chromium-bold-cjk-droid-font-fix-svn48276.patch
--- chromium-option-window-layout-svn48276.patch
--- chromium-webkit-droid-sans-fontconfig-fix.patch
--- ffmpegfix.patch
More information about the MeeGo-commits
mailing list