[meego-commits] 14449: Changes to devel:browser/chromium
haoli
no_reply at build.meego.com
Thu Mar 3 05:30:14 UTC 2011
Hi,
I have made the following changes to chromium in project devel:browser. Please review and accept ASAP.
Thank You,
haoli
[This message was auto-generated]
---
Request #14449:
submit: home:haoli:branches:devel:browser/chromium(r3)(cleanup) -> devel:browser/chromium
Message:
Update chromium from upstream to 11.0.678.0 static build
State: new 2011-03-02T16:28:10 haoli
Comment: None
changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Thu Mar 3 2011 Hao Li <hao.h.li at intel.com> - 11.0.678.0
+- Update chromium from upstream to 11.0.678.0 static build for BMC#10198,#13491,#13488,#12733,#11729,#11155,#9006,#9022,#10459, rebase some patches
+
old:
----
libv8.patch
new:
----
chromium-20100319-default-browser-setting.patch
chromium-system-ffmpeg.patch
webkit-complex-font-selection-fix.patch
spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -11,7 +11,7 @@
%global noisy 0
# Really, we want this on, but for testing...
-%global sharedbuild 1
+%global sharedbuild 0
## Maybe, someday, I'll be able to flip these on. ##
@@ -45,10 +45,13 @@
Patch1: ppapi_build_error.patch
# third_party/WebKit/Source/WebCore/storage/IDBFactoryBackendImpl.cpp:163:9: error: 'databaseVersion' may be used uninitialized in this function
Patch2: build_database_error.patch
+# undefined reference to `vpx_codec_dec_init_ver'
Patch3: libvpx.patch
-Patch4: libv8.patch
-
-
+Patch5: chromium-system-ffmpeg.patch
+#patch to fix default browser setting issues
+Patch6: chromium-20100319-default-browser-setting.patch
+# Fix droid sans font rendering issue
+Patch7: webkit-complex-font-selection-fix.patch
Source0: chromium-%{version}.tar.bz2
Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
@@ -156,8 +159,9 @@
%patch1 -p1 -b .ppapi_build_error
%patch2 -p1 -b .build_database_error
%patch3 -p1 -b .libvpx
-%patch4 -p1 -b .libv8
-
+%patch5 -p1 -b .chromium-system-ffmpeg
+%patch6 -p1 -b .chromium-20100319-default-browser-setting
+%patch7 -p1 -b .webkit-complex-font-selection-fix
pushd third_party/ffmpeg/
tar xf %{SOURCE5}
@@ -186,34 +190,14 @@
./build/gyp_chromium -f make build/all.gyp \
--depth . \
- -Dlinux_sandbox_path=%{_libdir}/chromium-browser/chrome-sandbox \
- -Dlinux_sandbox_chrome_path=%{_libdir}/chromium-browser/chromium-browser \
-%ifarch x86_64
- -Dtarget_arch=x64 \
-%endif
- -Duse_system_libpng=1 \
- -Duse_system_bzip2=1 \
- -Duse_system_libjpeg=1 \
- -Duse_system_zlib=1 \
- -Duse_system_libxslt=1 \
- -Duse_system_libxml=1 \
-Duse_system_ffmpeg=1 \
-%if 0%{?nss}
- -Duse_system_ssl=1 \
-%endif
- -Duse_system_libevent=1 \
-%if 0%{?selinux}
- -Dselinux=1 \
-%endif
-%if 0%{?sqlite}
- -Duse_system_sqlite=1 \
-%endif
%if 0%{?sharedbuild}
-Dlibrary=shared_library \
%endif
%if 0%{?sharedbuild}
-Drelease_extra_cflags=-fPIC \
%endif
+
%ifarch %{arm}
-Dtarget_arch=arm \
-Ddisable_nacl=1 \
@@ -222,9 +206,6 @@
-Darm_thumb=0 \
-Darm_neon=0 \
%endif
- -Ddisable_sse2=1 \
- -Dproprietary_codecs=1 \
- -Djavascript_engine=v8
%build
%if 0%{?selinux}
other changes:
--------------
++++++ chromium-20100319-default-browser-setting.patch (new)
--- chromium-20100319-default-browser-setting.patch
+++ chromium-20100319-default-browser-setting.patch
+diff --git a/third_party/xdg-utils/scripts/xdg-settings b/third_party/xdg-utils/scripts/xdg-settings
+index 7fc9f26..75bec18 100755
+--- a/third_party/xdg-utils/scripts/xdg-settings
++++ b/third_party/xdg-utils/scripts/xdg-settings
+@@ -30,6 +30,10 @@
+ #
+ #---------------------------------------------
+
++# To work with MeeGo desktop environment
++GNOME_DESKTOP_SESSION_ID="this-is-deprecated"
++export GNOME_DESKTOP_SESSION_ID
++
+ manualpage()
+ {
+ cat << _MANUALPAGE
++++++ chromium-system-ffmpeg.patch (new)
--- chromium-system-ffmpeg.patch
+++ chromium-system-ffmpeg.patch
+diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
+index fede662..e261d03 100644
+--- a/media/filters/ffmpeg_glue.cc
++++ b/media/filters/ffmpeg_glue.cc
+@@ -119,14 +119,16 @@ namespace media {
+ static const char kProtocol[] = "http";
+
+ // Fill out our FFmpeg protocol definition.
+-static URLProtocol kFFmpegURLProtocol = {
+- kProtocol,
+- &OpenContext,
+- &ReadContext,
+- &WriteContext,
+- &SeekContext,
+- &CloseContext,
+-};
++
++// static URLProtocol kFFmpegURLProtocol = {
++// kProtocol,
++// &OpenContext,
++// &ReadContext,
++// &WriteContext,
++// &SeekContext,
++// &CloseContext,
++//};
++
+
+ FFmpegGlue::FFmpegGlue() {
+ // Before doing anything disable logging as it interferes with layout tests.
+@@ -134,7 +136,7 @@ FFmpegGlue::FFmpegGlue() {
+
+ // Register our protocol glue code with FFmpeg.
+ avcodec_init();
+- av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
++// av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
+ av_lockmgr_register(&LockManagerOperation);
+
+ // Now register the rest of FFmpeg.
++++++ webkit-complex-font-selection-fix.patch (new)
--- webkit-complex-font-selection-fix.patch
+++ webkit-complex-font-selection-fix.patch
+diff --git a/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.cpp b/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+index bd33927..209b23a 100644
+--- a/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
++++ b/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+@@ -53,16 +53,45 @@ 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:
--- libv8.patch
More information about the MeeGo-commits
mailing list