[meego-packaging] [meego-commits] 8943: Changes to Trunk/chromium
Wei, James
james.wei at intel.com
Tue Nov 2 02:56:35 PDT 2010
I have reported a bug for this issue.
http://bugs.meego.com/show_bug.cgi?id=9341
when install chromium with rpm, there is such issue, while it is ok to use zipper to install rpm package.
Do we need to upgrade speex in MeeGo to 1.2 or just change the dependency of chromium to speex >= 1.1? or speex >= 1.2~rc1
The spec is got from fedora upstream.
Thanks
James
-----Original Message-----
From: Yang, Yi Y
Sent: Tuesday, November 02, 2010 4:59 PM
To: Zhu, Peter J; meego-packaging at meego.com
Cc: Li, Zhe A; Wei, James
Subject: RE: [meego-commits] 8943: Changes to Trunk/chromium
Depends on how to produce image, obviously it is questionable in bootstrap mode, my explanation is definite.
> -----Original Message-----
> From: Zhu, Peter J
> Sent: Tuesday, November 02, 2010 4:57 PM
> To: Yang, Yi Y; meego-packaging at meego.com
> Cc: Li, Zhe A; Wei, James
> Subject: RE: [meego-commits] 8943: Changes to Trunk/chromium
>
> Hmm, it's a request last week. We actually can produce netbook image.
>
> Peter
>
> > -----Original Message-----
> > From: Yang, Yi Y
> > Sent: Tuesday, November 02, 2010 4:48 PM
> > To: meego-packaging at meego.com; meego-commits at meego.com
> > Cc: Zhu, Peter J; Li, Zhe A
> > Subject: RE: [meego-commits] 8943: Changes to Trunk/chromium
> >
> > Hi,
> >
> > "+Requires: speex >= 1.2" can't be met because speex version is 1.2~rc1,
> it
> > is less than 1.2
> >
> > This change resulted in mic2 can't build image, please fix it, you may try "
> > Requires: speex > 1.1" but I'm sure it can work :-)
> >
> > > -----Original Message-----
> > > From: meego-commits-bounces at meego.com
> > > [mailto:meego-commits-bounces at meego.com] On Behalf Of Peter Zhu
> > > Sent: Wednesday, October 27, 2010 7:40 PM
> > > To: meego-commits at meego.com
> > > Subject: [meego-commits] 8943: Changes to Trunk/chromium
> > >
> > > Hi,
> > > I have made the following changes to chromium in project Trunk. Please
> > review
> > > and accept ASAP.
> > >
> > > Thank You,
> > > Peter Zhu
> > >
> > > [This message was auto-generated]
> > >
> > > ---
> > >
> > > Request #8943:
> > >
> > > submit: Trunk:Testing/chromium(r26) -> Trunk/chromium
> > >
> > >
> > > Message:
> > > Move to Trunk
> > >
> > > State: new 2010-10-27T04:38:11 peter
> > > Comment: None
> > >
> > >
> > >
> > > changes files:
> > > --------------
> > > --- chromium.changes
> > > +++ chromium.changes
> > > @@ -0,0 +1,6 @@
> > > +* Tue Oct 26 2010 Wei James <james.wei at intel.com> - 7.0.542.0
> > > +- Fix BMC#8940 for incorrect v8 dependency
> > > +
> > > +* Mon Oct 21 2010 Wei Fang <wei.w.fang at intel.com> - 7.0.542.0
> > > +- Update to 7.0.542.0 for BMC#8739, rebase some patches
> > > +
> > > @@ -150 +155,0 @@
> > > -
> > >
> > > old:
> > > ----
> > > chromium-20100218-webcore-hidden.patch
> > > chromium-20100315-explicit-export-webcore-symbols.patch
> > > chromium-20100315-hidden-option.patch
> > > chromium-20100315-system-zlib.patch
> > > chromium-20100408-ffmpeg-no-pkgconfig.patch
> > > chromium-20100408-system-expat.patch
> > > chromium-20100413-fix-yuv_row_posix-shared.patch
> > > chromium-20100415-flash-plugin-crash-fix.patch
> > > chromium-6.0.412.0-media-probe.patch
> > > chromium-6.0.425.0-ffmpegfix.patch
> > > chromium-6.0.425.0-system-expat.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
> > > chromium-fix-gcc-4.5-build-errors.patch
> > > chromium-importer-crash-fix.patch
> > >
> > > new:
> > > ----
> > > chromium-6.0.488.0-system-zlib.patch
> > > chromium-7.0.500.0-system-speex.patch
> > > chromium-7.0.503.0-system-expat.patch
> > > chromium-7.0.510.0-fstat.patch
> > > chromium-7.0.510.0-sharedlibfixes.patch
> > > chromium-7.0.510.0-system-ffmpeg.patch
> > > chromium-7.0.542.0-codechanges-system-minizip-nss-nspr-v8.patch
> > > chromium-7.0.542.0-fix-wrapper.patch
> > > chromium-7.0.542.0-fix_NULL_conversion_errors.patch
> > > chromium-7.0.542.0-gyp-system-icu.patch
> > > chromium-7.0.542.0-media-probe.patch
> > > chromium-7.0.542.0-system-gyp-v8.patch
> > > chromium-7.0.542.0-system-libjingle.patch
> > > chromium-7.0.542.0-system-libvpx.patch
> > > chromium-7.0.542.0-system-speex-static.patch
> > > chromium-7.0.542.0-system-srtp.patch
> > > chromium-7.0.542.0.tar.bz2
> > > chromium-daily-tarball.sh
> > > chromium-latest.py
> > > ffmpeg-0.6-headers.tar.bz2
> > > gcc-4.5.0--noinline-noclone.patch
> > > libvpx.patch
> > >
> > > spec files:
> > > -----------
> > > --- chromium.spec
> > > +++ chromium.spec
> > > @@ -1,10 +1,18 @@
> > > -%global svndate 20100805
> > > -%global svnver svn55059
> > > -%global v8ver 2.3.5
> > > +# Update this with every matching v8 build
> > > +%global v8ver 2.4.8
> > > +
> > > +# If we're using a svn checkout, define this
> > > +# %%global svncheckout 20100819svn56724
> > > +
> > > +# We need policy first.
> > > +%global selinux 0
> > >
> > > # Useful for debugging
> > > %global noisy 0
> > >
> > > +# Really, we want this on, but for testing...
> > > +%global sharedbuild 1
> > > +
> > > ## Maybe, someday, I'll be able to flip these on. ##
> > >
> > > # Chromium depends on forked sqlite features not foind in upstream.
> > > @@ -13,37 +21,38 @@
> > > # Chromium depends on forked NSS features not found in upstream.
> > > %global nss 0
> > >
> > > -# TODO: Proper list of licenses
> > > -License: BSD and LGPLv2+
> > > -Group: Applications/Internet
> > > +# It may at some point become too painful to maintain this.
> > > +%global jingle 0
> > >
> > > Name: chromium
> > > -# see chrome/VERSION
> > > -Version: 6.0.486.0
> > > -Release: 1%{?dist}
> > > +# see src/chrome/VERSION
> > > +# Google's versioning is interesting. They never reset "BUILD", which is
> how
> > > we jumped
> > > +# from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch
> > > +Version: 7.0.542.0
> > > +Release: 4%{?svncheckout:.%{svncheckout}}%{?dist}
> > > Summary: A WebKit powered web browser
> > > # Licensing Overview
> > > #
> > > # ffmpeg headers are LGPLv2+
> > > # libjingle is BSD
> > >
> > > +# TODO: Proper list of licenses
> > > +License: BSD and LGPLv2+
> > > +Group: Applications/Internet
> > > # Just the code changes, none of the "makefile" changes
> > > -Patch0:
> > > chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
> > > +Patch0:
> > > chromium-7.0.542.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.453.1-system-gyp-v8.patch
> > > +Patch2: chromium-7.0.542.0-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.486.0-gyp-system-icu.patch
> > > -
> > > -# Code changes to use system libicu
> > > -Patch8: chromium-6.0.486.0-icu-code-changes.patch
> > > +Patch7: chromium-7.0.542.0-gyp-system-icu.patch
> > >
> > > # Revert this change to stop crashes
> > > #
> > >
> >
> http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/sqlite_uti
> > > ls.cc?r1=24321&r2=25633
> > > @@ -53,13 +62,13 @@
> > > Patch10: chromium-20100419-system-nss.patch
> > >
> > > # Fix shared libs
> > > -Patch11: chromium-6.0.476.0-sharedlibfixes.patch
> > > +Patch11: chromium-7.0.510.0-sharedlibfixes.patch
> > >
> > > # Fix ChromiumThreading issue in wtf shared lib
> > > Patch12: chromium-6.0.451.0-shared-chromiumthreading.patch
> > >
> > > # Don't use the second copy of zlib
> > > -Patch13: chromium-20100315-system-zlib.patch
> > > +Patch13: chromium-6.0.488.0-system-zlib.patch
> > >
> > > # Don't embed incorrect RPATH into shared libs
> > > Patch14: chromium-20091209-norpath.patch
> > > @@ -80,90 +89,100 @@
> > > Patch19: chromium-no-test-sources.patch
> > >
> > > # Fix the wrapper
> > > -# Patch20: chromium-fix-wrapper.patch
> > > +Patch20: chromium-7.0.542.0-fix-wrapper.patch
> > >
> > > # Fix media probing
> > > -Patch22: chromium-6.0.412.0-media-probe.patch
> > > +Patch22: chromium-7.0.542.0-media-probe.patch
> > >
> > > # Use system expat
> > > -Patch23: chromium-6.0.425.0-system-expat.patch
> > > +Patch23: chromium-7.0.503.0-system-expat.patch
> > >
> > > # Fix ffmpeg wrapper compile
> > > -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
> > >
> > > -# Fix yuv_row_posix when compiled with -fPIC
> > > -Patch27: chromium-20100413-fix-yuv_row_posix-shared.patch
> > > +# Fix ppapi NULL errors
> > > +Patch28: chromium-7.0.542.0-fix_NULL_conversion_errors.patch
> > >
> > > -################# patches from fedora ends
> > > ###############################
> > > +# Use system libjingle
> > > +#Patch29: chromium-7.0.542.0-system-libjingle.patch
> > >
> > > +# Use system speex
> > > +Patch30: chromium-7.0.500.0-system-speex.patch
> > >
> > > -# Fix gcc4.5 NULL converstion errors
> > > -Patch28: chromium-fix-gcc-4.5-build-errors.patch
> > > -
> > > -# Fix tcmalloc gcc 4.5
> > > -Patch29: tcmalloc-fix.patch
> > > +# Hacks to use system ffmpeg
> > > +Patch31: chromium-7.0.510.0-system-ffmpeg.patch
> > >
> > > +# Fix fstat usage
> > > +Patch32: chromium-7.0.510.0-fstat.patch
> > >
> > > -########### patches to re-org the visibility options in Chromium browser
> > > build start
> > > +# Use system libsrtp
> > > +#Patch33: chromium-7.0.542.0-system-srtp.patch
> > >
> > > -#Patch101: chromium-20100315-hidden-option.patch
> > > +# Use system libvpx for chromoting
> > > +#Patch34: chromium-7.0.542.0-system-libvpx.patch
> > >
> > > -#patch to add -fvisibility=hidden when building WebCore shared library
> > > -#Patch102: chromium-20100218-webcore-hidden.patch
> > > -
> > > -#patch to explicitly export symbols in WebCore
> > > -#Patch103:
> > > chromium-20100315-explicit-export-webcore-symbols.patch
> > > -
> > > -########### patches to re-org the visibility options in Chromium browser
> > > build ends
> > > +# Fix tcmalloc gcc 4.5
> > > +Patch132: tcmalloc-fix.patch
> > >
> > > +# Fix gcc noinline bug in GCC-4.5.0
> > > +Patch133: gcc-4.5.0--noinline-noclone.patch
> > >
> > > +Patch134: libvpx.patch
> > >
> > > ############### patches for MeeGo integration start
> > > -
> > > #patch to let window manager to switch browser's zone to font
> > > Patch202: chromium-browser-window-focus.patch
> > >
> > > #patch to fix default browser setting issue
> > > Patch204: chromium-20100319-default-browser-setting.patch
> > >
> > > -#patch to expose chromium browser api
> > > -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 droid sans font rendering issue
> > > Patch208: webkit-complex-font-selection-fix.patch
> > > -
> > > -# Fix chromium importer crash bug BMC#6750
> > > -Patch209: chromium-importer-crash-fix.patch
> > > ################ patches for MeeGo integration ends
> > >
> > >
> > > -Source0: chromium-%{version}-%{svndate}%{svnver}.tar.bz2
> > > +# STATIC ONLY PATCHES
> > > +#Patch35: chromium-7.0.542.0-system-speex-static.patch
> > > +
> > > +# OLD: Use chromium-daily-tarball.sh to generate tarball from svn.
> > > +# New: Use chromium-latest.py to generate clean tarball from released
> > build
> > > tarballs, found here:
> > > +# http://build.chromium.org/buildbot/official/
> > > +%if %{defined svncheckout}
> > > +Source0: chromium-%{version}-%{?svncheckout}.tar.lzma
> > > +%else
> > > +Source0: chromium-%{version}.tar.bz2
> > > +%endif
> > > # Custom build tools for chromium, hammer is a fancy front-end for scons
> > > Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
> > > Source2: chromium-browser.sh
> > > Source3: chromium-browser.desktop
> > > +# We don't actually use this in the build, but it is included so you can make
> > the
> > > tarball.
> > > +Source4: chromium-daily-tarball.sh
> > > Source5: chromium-browser.xml
> > > +# Set default prefs
> > > +#Source6: master_preferences
> > > +# Also, only used if you want to reproduce the clean tarball.
> > > +Source7: chromium-latest.py
> > > +# Official ffmpeg headers
> > > +Source8: ffmpeg-0.6-headers.tar.bz2
> > >
> > > -BuildRoot: %{_tmppath}/%{name}-%{version}-build
> > > -Provides: chromium-based-browser
> > > +BuildRoot:
> %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}
> > > -n)
> > > BuildRequires: bzip2-devel, libevent-devel, libjpeg-devel, libpng-devel
> > > -BuildRequires: libxslt-devel, nspr-devel, minizip-devel
> > > +BuildRequires: libxslt-devel, nss-devel, nspr-devel, minizip-devel
> > > BuildRequires: v8-devel, gcc-c++, bison, flex, gtk2-devel, atk-devel
> > > BuildRequires: fontconfig-devel, GConf2-devel, dbus-devel,
> alsa-lib-devel
> > > -BuildRequires: desktop-file-utils, gperf, libicu-devel
> > > -BuildRequires: nss-devel >= 3.12.3, glew-devel,
> > > -BuildRequires: pkgconfig(glu), libXScrnSaver-devel, expat-devel, fdupes
> > > -BuildRequires: python, cups-devel
> > > +BuildRequires: desktop-file-utils, gperf
> > > +BuildRequires: nss-devel >= 3.12.3, expat-devel
> > > +BuildRequires: dbus-glib-devel, libXScrnSaver-devel
> > > +BuildRequires: cups-devel
> > >
> > > BuildRequires: libgnome-keyring-devel
> > >
> > > +BuildRequires: libicu-devel >= 4.2
> > > +
> > > # NaCl needs these
> > > BuildRequires: libstdc++-devel, openssl-devel
> > >
> > > @@ -171,54 +190,76 @@
> > > BuildRequires: sqlite-devel
> > > %endif
> > >
> > > +# On x86_64, it also needs these:
> > > +# %ifarch x86_64
> > > +# BuildRequires: glibc-devel(x86-32), libgcc(x86-32)
> > > +# %endif
> > > +
> > > +#%if 0%{?jingle}
> > > +#BuildRequires: libjingle-devel >= 0.4.0-7
> > > +#%endif
> > > +
> > > +BuildRequires: speex-devel
> > > +
> > > ExclusiveArch: %{ix86} arm x86_64
> > >
> > > # GTK modules it expects to find for some reason.
> > > -#Requires: libcanberra-gtk2%{_isa}
> > > +Requires: libcanberra-gtk2%{_isa}
> > >
> > > # We pick up an automatic requires on the library, but we need the version
> > > check
> > > # because the nss shared library is unversioned.
> > > -# This is to prevent from hitting
> > > http://code.google.com/p/chromium/issues/detail?id=26448
> > > +# This is to prevent someone from hitting
> > > http://code.google.com/p/chromium/issues/detail?id=26448
> > > Requires: nss%{_isa} >= 3.12.3
> > > Requires: nss-mdns%{_isa}
> > >
> > > +%if 0%{?sharedbuild}
> > > # We want to make sure we have the chromium-libs
> > > Requires: chromium-libs = %{version}-%{release}
> > > -
> > > -# Chromium needs xdg-utils to integrate with MeeGo
> > > -Requires: xdg-utils
> > > +%else
> > > +# We hardcode this because we don't get symbol deps with newer v8
> > versions
> > > +# This forces an upgrade
> > > +Requires: v8 >= %{v8ver}
> > > +# This is a lie, but it keeps upgrades semi-sane
> > > +Provides: chromium-libs = %{version}-%{release}
> > > +Obsoletes: chromium-libs <= %{version}-%{release}
> > > +%endif
> > >
> > > %description
> > > Chromium is an open-source web browser, powered by WebKit.
> > >
> > > +%if 0%{?sharedbuild}
> > > %package libs
> > > Summary: Shared libraries for chromium
> > > Group: System Environment/Libraries
> > > # We hardcode this because we don't get symbol deps with newer v8
> > versions
> > > # This forces an upgrade
> > > Requires: v8 >= %{v8ver}
> > > +Requires: icu >= 4.2
> > > +Requires: speex >= 1.2
> > >
> > > %description libs
> > > This package contains the shared libraries that chromium depends on.
> > Some
> > > of
> > > these libraries are unique to chromium, others are forked versions of
> > system
> > > libraries.
> > > -
> > > -%package devel
> > > -Summary: Header file for chromium browser
> > > -Group: Development/Libraries
> > > -Requires: chromium-libs = %{version}-%{release}
> > > -
> > > -%description devel
> > > -This package contains the header files and pc file of chromium browser for
> > > -applications which will use chromium browser APIs.
> > > +%endif
> > >
> > > %prep
> > > echo "####### BUILD OPTIONS #######"
> > > +echo "Using system NSS: %{nss}"
> > > +echo "Using system sqlite3: %{sqlite}"
> > > +echo "Built-in SELinux support: %{selinux}"
> > > echo "Verbose Build: %{noisy}"
> > > -%setup -q -n chromium-%{version}-%{svndate}%{svnver} -a 1
> > > +%if 0%{?sharedbuild}
> > > +echo "Shared Build"
> > > +%else
> > > +echo "Static Build"
> > > +%endif
> > > +%setup -q -n chromium-%{version}%{?svncheckout:-%{svncheckout}} -a 1
> > > +cp %{SOURCE4} .
> > >
> > > -# Remove Another copy of zlib
> > > -rm -rf third_party/WebKit/WebCore/platform/image-decoders/zlib/
> > > +%if %{defined svncheckout}
> > > +mv src/* .
> > > +%endif
> > >
> > > # Patch in code changes for system libs
> > > %patch0 -p1 -b .system-code
> > > @@ -232,36 +273,45 @@
> > > # Use system libicu
> > > %patch7 -p1 -b .system-icu
> > >
> > > -# Code changes to use system libicu
> > > -%patch8 -p1 -b .icu
> > > -
> > > # Revert sqlite debugging to stop crashes
> > > %patch9 -p1 -b .no-sqlite-debugging
> > >
> > > # Webkit needs to pull in nss to get to nspr headers
> > > %patch10 -p1 -b .system-nss
> > >
> > > +%if 0%{?sharedbuild}
> > > +
> > > # Fix missing symbols in shared libs
> > > %patch11 -p1 -b .sharedlibsfixes
> > >
> > > # Fix ChromiumThreading issue in wtf shared lib
> > > %patch12 -p1 -b .chromiumthreading
> > >
> > > +%endif
> > > +
> > > # Don't use the second copy of zlib either
> > > %patch13 -p1 -b .system-zlib
> > >
> > > +%if 0%{?sharedbuild}
> > > +
> > > # Don't embed incorrect rpath into shared libs
> > > %patch14 -p1 -b .norpath
> > >
> > > +%endif
> > > +
> > > # Courgette not in source tree
> > > %patch15 -p1 -b .no-courgette
> > >
> > > +%if 0%{?sharedbuild}
> > > +
> > > # Nacl needs fPIC, even on x86_32
> > > %patch16 -p1 -b .fPIC
> > >
> > > # chrome_dll_main.c needs libnacl for NaClMain()
> > > %patch17 -p1 -b .NaClMain
> > >
> > > +%endif
> > > +
> > > # Use system libGLEW
> > > # They've forked this beyond recognition.
> > > # %patch18 -p1 -b .GLEW
> > > @@ -270,10 +320,7 @@
> > > %patch19 -p1 -b .notests
> > >
> > > # Fix the wrapper
> > > -#%patch20 -p1 -b .fix
> > > -
> > > -# Set master_prefs to a sane location
> > > -#%patch21 -p1 -b .master_prefs
> > > +%patch20 -p1 -b .fix
> > >
> > > # Fix media probing
> > > %patch22 -p1 -b .media-probe
> > > @@ -282,88 +329,113 @@
> > > %patch23 -p1 -b .system-expat
> > >
> > > # Fix ffmpeg wrapper
> > > -%patch24 -p1 -b .fix-ffmpeg
> > > %patch25 -p1 -b .no-pkgconfig
> > >
> > > # Don't build stupid empty shell zlib
> > > %patch26 -p1 -b .empty-shell
> > >
> > > -# Fix yuv_row_posix when compiled with -fPIC
> > > -%patch27 -p1 -b .fix-yrp
> > >
> > > -# Fix gcc4.5 NULL converstion errors
> > > -%patch28 -p0 -b .fix-gcc-4.5
> > > +# Except this one. We always need it.
> > >
> > > -# Fix tcmalloc gcc4.5 issue
> > > -%patch29 -p1 -b .fix-tcmalloc-4.5
> > > +# Fix NULL errors with gcc45
> > > +%patch28 -p1 -b .NULL
> > >
> > > +#%if 0%{?vanillabuild}
> > > +# Ignore the rest of the patchset.
> > > +#%else
> > > +
> > > +#%if 0%{?jingle}
> > > +# Use system libjingle
> > > +#%patch29 -p1 -b .jingle
> > > +#%endif
> > > +
> > > +%if 0%{?sharedbuild}
> > > +# Use system speex
> > > +%patch30 -p1 -b .speex
> > >
> > > +%else
> > > +# Static build causes patch30 to not apply cleanly
> > > +%patch35 -p1 -b .speex
> > > +%endif
> > >
> > > -#patch to re-org the visibility options in Chromium browser build
> > > -#%patch101 -p1
> > > +# Hacks for system ffmpeg
> > > +%patch31 -p1 -b .system-ffmpeg
> > >
> > > -#patch to add -fvisibility=hidden when building WebCore shared library
> > > -#%patch102 -p1
> > > +# Fix fstat
> > > +%patch32 -p1 -b .fstat
> > >
> > > -#patch to explicitly export symbols in WebCore
> > > -#%patch103 -p1
> > > +# Fix tcmalloc gcc4.5 issue
> > > +%patch132 -p1 -b .fix-tcmalloc-4.5
> > > +%patch133 -p1
> > > +%patch134 -p1
> > >
> > > ##patches for MeeGo integration
> > > %patch202 -p1
> > > %patch204 -p1
> > > -%patch205 -p1
> > > -%patch206 -p1
> > > -%patch208 -p1 -d third_party/WebKit
> > > -%patch209 -p1
> > > +%patch208 -p1
> > > +
> > > +pushd third_party/ffmpeg/
> > > +tar xf %{SOURCE8}
> > > +popd
> > > +
> > > +# TODO: Remove this from source tarball
> > > +#rm -rf third_party/libsrtp/ third_party/libvpx/ third_party/speex/
> > > +#rm -rf third_party/libvpx/
> > > +
> > > +#%endif
> > >
> > > # Scrape out incorrect optflags and hack in the correct ones
> > > +%if 0%{?sharedbuild}
> > > PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS
> -DUSE_SYSTEM_LIBEVENT
> > > -fPIC -fno-strict-aliasing -fno-ipa-cp \' | sed "s/ /',/g" | sed "s/',/', '/g"`
> > > +%else
> > > +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS
> -DUSE_SYSTEM_LIBEVENT
> > > -fno-strict-aliasing -fno-ipa-cp \' | sed "s/ /',/g" | sed "s/',/', '/g"`
> > > +%endif
> > > for i in build/common.gypi; do
> > > sed -i "s|'-march=pentium4',||g" $i
> > > - sed -i "s|'-msse2',||g" $i
> > > sed -i "s|'-mfpmath=sse',||g" $i
> > > sed -i "s|'-O<(debug_optimize)',||g" $i
> > > sed -i "s|'-m32',||g" $i
> > > sed -i "s|'-fno-exceptions',|$PARSED_OPT_FLAGS|g" $i
> > > done
> > >
> > > -
> > > -# Force this down chromium's gullet.
> > > -# %ifarch x86_64
> > > -# sed -i "s|'ia32'|'x64'|g" src/build/common.gypi
> > > -# sed -i "s|'ia32'|'x64'|g" src/native_client/build/common.gypi
> > > -# %endif
> > > +rm -rf third_party/speex/
> > >
> > > # Regenerate the make files
> > > # Also, set the sandbox paths correctly.
> > > -# We set use_system_ffmpeg so chromium doesn't try to build ffmpeg
> > source
> > > that we strip out
> > > -
> > > -# Also, forked nss means that we can't use system ssl.
> > >
> > > ./build/gyp_chromium -f make build/all.gyp \
> > > --depth . \
> > > - -D
> > > linux_sandbox_path=%{_libdir}/chromium-browser/chrome-sandbox \
> > > - -D
> > >
> >
> linux_sandbox_chrome_path=%{_libdir}/chromium-browser/chromium-browser
> > > \
> > > +
> > > -Dlinux_sandbox_path=%{_libdir}/chromium-browser/chrome-sandbox \
> > > +
> > >
> >
> -Dlinux_sandbox_chrome_path=%{_libdir}/chromium-browser/chromium-brow
> > > ser \
> > > %ifarch x86_64
> > > - -D target_arch=x64 \
> > > + -Dtarget_arch=x64 \
> > > %endif
> > > - -D use_system_libpng=1 \
> > > - -D use_system_bzip2=1 \
> > > - -D use_system_libjpeg=1 \
> > > - -D use_system_zlib=1 \
> > > - -D use_system_libxslt=1 \
> > > - -D use_system_libxml=1 \
> > > - -D use_system_ffmpeg=1 \
> > > + -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}
> > > - -D use_system_ssl=1 \
> > > + -Duse_system_ssl=1 \
> > > +%endif
> > > + -Duse_system_libevent=1 \
> > > +%if 0%{?selinux}
> > > + -Dselinux=1 \
> > > %endif
> > > - -D use_system_libevent=1 \
> > > %if 0%{?sqlite}
> > > - -D use_system_sqlite=1 \
> > > + -Duse_system_sqlite=1 \
> > > %endif
> > > - -D library=shared_library \
> > > - -D release_extra_cflags=-fPIC \
> > > - -D javascript_engine=v8
> > > +%if 0%{?sharedbuild}
> > > + -Dlibrary=shared_library \
> > > +%endif
> > > +%if 0%{?sharedbuild}
> > > + -Drelease_extra_cflags=-fPIC \
> > > +%endif
> > > + -Ddisable_sse2=1 \
> > > + -Dproprietary_codecs=1 \
> > > + -Djavascript_engine=v8
> > >
> > > %build
> > > %if 0%{?selinux}
> > > @@ -380,53 +452,47 @@
> > > %endif
> > > %endif
> > >
> > > +# If we're building sandbox without SELINUX, add "chrome_sandbox" here.
> > > +# %if 0%{?selinux}
> > > +# %if 0%{?noisy}
> > > +# ../../depot_tools/hammer --mode=Release --verbose chrome
> > > +# %else
> > > +# ../../depot_tools/hammer --mode=Release chrome
> > > +# %endif
> > > +# %else
> > > +# %if 0%{?noisy}
> > > +# ../../depot_tools/hammer --mode=Release --verbose chrome
> > > chrome_sandbox
> > > +# %else
> > > +# ../../depot_tools/hammer --mode=Release chrome chrome_sandbox
> > > +# %endif
> > > +# %endif
> > > +
> > > %install
> > > rm -rf %{buildroot}
> > > mkdir -p %{buildroot}%{_bindir}
> > > -install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/chromium-browser
> > > +cp -a %{SOURCE2} %{buildroot}%{_bindir}/chromium-browser
> > > # x86_64 capable systems need this
> > > sed -i
> > >
> >
> "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_bindir}/chromiu
> > > m-browser
> > > mkdir -p %{buildroot}%{_libdir}/chromium-browser/
> > > mkdir -p %{buildroot}%{_mandir}/man1/
> > > pushd out/Release
> > > -cp -a chrome.pak locales resources resources.pak
> > > xdg-settings %{buildroot}%{_libdir}/chromium-browser/
> > > +cp -a chrome.pak locales resources
> > > resources.pak %{buildroot}%{_libdir}/chromium-browser/
> > > cp -a
> chrome %{buildroot}%{_libdir}/chromium-browser/chromium-browser
> > > +%if 0%{?sharedbuild}
> > > cp -a lib.target/lib*.so %{buildroot}%{_libdir}/chromium-browser/
> > > cp -a lib.host/lib*.so %{buildroot}%{_libdir}/chromium-browser/
> > > +%endif
> > > +# If we're building without SELINUX support, uncomment this line.
> > > +%if 0%{?selinux}
> > > +# Do nothing. Sandboxing is in the selinux policy and core binary.
> > > +%else
> > > cp -a
> > >
> chrome_sandbox %{buildroot}%{_libdir}/chromium-browser/chrome-sandbox
> > > +%endif
> > > cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
> > > cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium-browser.1
> > > -%fdupes %{buildroot}%{_mandir}/man1/
> > > mkdir -p %{buildroot}%{_libdir}/chromium-browser/plugins/
> > > popd
> > >
> > > -# devel package install
> > > -mkdir -p %{buildroot}%{_libdir}/chromium-browser/include
> > > -find base -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find app -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find chrome -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find skia -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find build -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find googleurl -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find ipc -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find testing -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find net -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find third_party/skia -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find third_party/WebKit -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find webkit -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find gfx -name "*.h" -exec cp --parents
> > > {} %{buildroot}%{_libdir}/chromium-browser/include \;
> > > -find %{buildroot}%{_libdir}/chromium-browser/include -name "*.h" -exec
> > > chmod 644 {} \;
> > > -%fdupes %{buildroot}%{_libdir}/chromium-browser/include
> > > -
> > > -mkdir -p %{buildroot}/usr/lib/pkgconfig
> > > -cat <<! > %{buildroot}/usr/lib/pkgconfig/chromium-browser.pc
> > > -Name: Chromium browser
> > > -Description: Chromium browser development package
> > > -Version: 1.0.1
> > > -Libs: -L%{_libdir}/chromium-browser -lapp_base -lallocator -lappcache
> -lbase
> > > -lbase_i18n -lbrowser -lcommon -lcommon_net -lcommon_constants
> > > -ldatabase -ldebugger -lffmpeg -lglue -lgoogleurl -lharfbuzz
> > -lharfbuzz_interface
> > > -lhunspell -lipc -lil -lchrome_version_info -lmedia -lmodp_b64 -lnet
> -lnet_base
> > > -lnotifier -lomx_wrapper -lots -lpcre -lplugin -lprinting -lprofile_import
> > -lprotobuf
> > > -lprotobuf_lite -lrenderer -lsandbox -lsdch -lskia -ljingle -lsqlite3 -lsync
> > -lsyncapi
> > > -lutility -lwebcore -lwebcore_bindings -lworker -lwtf -lgfx -lsymbolize
> > > -linstaller_util -lcld -lskia_opts -lxdg_mime -lnss3 -lnssutil3 -lsmime3 -lssl
> > > -ldynamic_annotations -lservice
> > > -Cflags: -I%{_libdir}/chromium-browser/include
> > > -I%{_libdir}/chromium-browser/include/skia/config
> > > -!
> > > -
> > > mkdir -p %{buildroot}%{_datadir}/pixmaps/
> > > cp -a
> > >
> >
> chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/p
> > > ixmaps/chromium-browser.png
> > >
> > > @@ -436,73 +502,113 @@
> > > mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
> > > cp
> > >
> -a %{SOURCE5} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
> > >
> > > +# Install the master_preferences file
> > > +#mkdir -p %{buildroot}%{_sysconfdir}
> > > +#install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}
> > > +
> > > +# This enables HTML5 video if you have ffmpeg installed, you naughty
> > naughty
> > > user.
> > > +pushd %{buildroot}%{_libdir}/chromium-browser
> > > +touch %{buildroot}%{_libdir}/libavcodec.so.52
> > > +ln -s %{_libdir}/libavcodec.so.52 libavcodec.so.52
> > > +touch %{buildroot}%{_libdir}/libavformat.so.52
> > > +ln -s %{_libdir}/libavformat.so.52 libavformat.so.52
> > > +touch %{buildroot}%{_libdir}/libavutil.so.50
> > > +ln -s %{_libdir}/libavutil.so.50 libavutil.so.50
> > > +popd
> > >
> > > %clean
> > > rm -rf %{buildroot}
> > >
> > > %files
> > > %defattr(-,root,root,-)
> > > -%{_bindir}/chromium-browser
> > > +%doc chromium-daily-tarball.sh
> > > +%attr(755, root, root) %{_bindir}/chromium-browser
> > > +%{_libdir}/chromium-browser/chrome.pak
> > > %{_libdir}/chromium-browser/chromium-browser
> > > +# Uncomment this line if building without SELINUX
> > > +%if 0%{?selinux}
> > > +# Do nothing. Sandboxing is in the selinux policy and core binary.
> > > +%else
> > > # These unique permissions are intentional and necessary for the
> > sandboxing
> > > %attr(4555, root, root) %{_libdir}/chromium-browser/chrome-sandbox
> > > +%endif
> > > +%{_libdir}/chromium-browser/locales/
> > > %{_libdir}/chromium-browser/plugins/
> > > %{_libdir}/chromium-browser/resources/
> > > +%{_libdir}/chromium-browser/resources.pak
> > > # %%{_libdir}/chromium-browser/themes/
> > > -%{_libdir}/chromium-browser/xdg-settings
> > > %{_mandir}/man1/chrom*
> > > %{_datadir}/pixmaps/chromium-browser.png
> > > %{_datadir}/applications/*.desktop
> > > %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
> > > +# %{_sysconfdir}/%{name}
> > > +%if 0%{?sharedbuild}
> > > +# Do nothing, we're covered in -libs
> > > +%else
> > > +%dir %{_libdir}/chromium-browser/
> > > +# These are dummy symlinks. You'll have to install ffmpeg-libs to get them
> > for
> > > real.
> > > +%{_libdir}/chromium-browser/libavcodec.so.52
> > > +%{_libdir}/chromium-browser/libavutil.so.50
> > > +%{_libdir}/chromium-browser/libavformat.so.52
> > > +%exclude %{_libdir}/libavcodec.so.52
> > > +%exclude %{_libdir}/libavutil.so.50
> > > +%exclude %{_libdir}/libavformat.so.52
> > > +%endif
> > >
> > > -
> > > -
> > > +%if 0%{?sharedbuild}
> > > %files libs
> > > %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
> > > +# These are dummy symlinks. You'll have to install ffmpeg-libs to get them
> > for
> > > real.
> > > +%{_libdir}/chromium-browser/libavcodec.so.52
> > > +%{_libdir}/chromium-browser/libavutil.so.50
> > > +%{_libdir}/chromium-browser/libavformat.so.52
> > > +# These are real.
> > > %{_libdir}/chromium-browser/liballocator.so
> > > +%{_libdir}/chromium-browser/libapp_base.so
> > > %{_libdir}/chromium-browser/libappcache.so
> > > %{_libdir}/chromium-browser/libbase.so
> > > %{_libdir}/chromium-browser/libbase_i18n.so
> > > +%{_libdir}/chromium-browser/libblob.so
> > > %{_libdir}/chromium-browser/libbrowser.so
> > > -%{_libdir}/chromium-browser/libchrome_gpu.so
> > > -
> > > %{_libdir}/chromium-browser/libcacheinvalidation.so
> > > +%{_libdir}/chromium-browser/libchrome_gpu.so
> > > +%{_libdir}/chromium-browser/libsrtp.so
> > > +# %{_libdir}/chromium-browser/libchrome_version_info.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
> > > %{_libdir}/chromium-browser/libcommon_constants.so
> > > +%{_libdir}/chromium-browser/libcommon_net.so
> > > %{_libdir}/chromium-browser/libdatabase.so
> > > %{_libdir}/chromium-browser/libdebugger.so
> > > +%{_libdir}/chromium-browser/libdefault_plugin.so
> > > %{_libdir}/chromium-browser/libdynamic_annotations.so
> > > -# Note: This is a dummy lib. There isn't any ffmpeg code in here.
> > > +%{_libdir}/chromium-browser/libfileapi.so
> > > +# Note: This is a dummy lib. There isn't any troublesome ffmpeg code in
> > here.
> > > +# Unless vanillabuild is set. Then there is.
> > > %{_libdir}/chromium-browser/libffmpeg.so
> > > %{_libdir}/chromium-browser/libgfx.so
> > > %{_libdir}/chromium-browser/libglue.so
> > > %{_libdir}/chromium-browser/libgoogleurl.so
> > > +%{_libdir}/chromium-browser/libgtest.so
> > > %{_libdir}/chromium-browser/libharfbuzz.so
> > > %{_libdir}/chromium-browser/libharfbuzz_interface.so
> > > +%{_libdir}/chromium-browser/libhttp_listen_socket.so
> > > %{_libdir}/chromium-browser/libhunspell.so
> > > %{_libdir}/chromium-browser/libipc.so
> > > %{_libdir}/chromium-browser/libil.so
> > > %{_libdir}/chromium-browser/libinstaller_util.so
> > > +#%if 0%{?jingle}
> > > +# Do nothing. We're using system-y goodness.
> > > +#%else
> > > %{_libdir}/chromium-browser/libjingle.so
> > > -%{_libdir}/chromium-browser/libchrome_version_info.so
> > > +%{_libdir}/chromium-browser/libjingle_p2p.so
> > > +#%endif
> > > %{_libdir}/chromium-browser/libmedia.so
> > > %{_libdir}/chromium-browser/libmodp_b64.so
> > > # This isn't a shared lib anymore. A shame.
> > > @@ -524,21 +630,35 @@
> > > %{_libdir}/chromium-browser/libservice.so
> > > %{_libdir}/chromium-browser/libskia.so
> > > %{_libdir}/chromium-browser/libskia_opts.so
> > > +%if 0%{?sqlite}
> > > +# Do nothing. We're using system-y goodness.
> > > +%else
> > > %{_libdir}/chromium-browser/libsqlite3.so
> > > -# If/when nss is no longer so forked that we cannot use the system lib, this
> > > should go away.
> > > +%endif
> > > +%if 0%{?nss}
> > > +# Do nothing. We're using system-y goodness.
> > > +%else
> > > %{_libdir}/chromium-browser/libssl.so
> > > +%endif
> > > %{_libdir}/chromium-browser/libsymbolize.so
> > > %{_libdir}/chromium-browser/libsync.so
> > > %{_libdir}/chromium-browser/libsyncapi.so
> > > +%{_libdir}/chromium-browser/libsync_notifier.so
> > > +%{_libdir}/chromium-browser/libtrace_proto_lib.so
> > > +%{_libdir}/chromium-browser/libundoview.so
> > > %{_libdir}/chromium-browser/libutility.so
> > > -%{_libdir}/chromium-browser/libwebcore.so
> > > +# %{_libdir}/chromium-browser/libwebcore.so
> > > %{_libdir}/chromium-browser/libwebcore_bindings.so
> > > +%{_libdir}/chromium-browser/libwebcore_html.so
> > > +%{_libdir}/chromium-browser/libwebcore_platform.so
> > > +%{_libdir}/chromium-browser/libwebcore_remaining.so
> > > +%{_libdir}/chromium-browser/libwebcore_svg.so
> > > +%{_libdir}/chromium-browser/libwebkit_user_agent.so
> > > %{_libdir}/chromium-browser/libworker.so
> > > %{_libdir}/chromium-browser/libwtf.so
> > > %{_libdir}/chromium-browser/libxdg_mime.so
> > > +%exclude %{_libdir}/libavcodec.so.52
> > > +%exclude %{_libdir}/libavutil.so.50
> > > +%exclude %{_libdir}/libavformat.so.52
> > > +%endif
> > >
> > > -%files devel
> > > -%defattr(-,root,root,-)
> > > -%dir %{_libdir}/chromium-browser/include
> > > -%{_libdir}/chromium-browser/include/*
> > > -/usr/lib/pkgconfig/chromium-browser.pc
> > >
> > > other changes:
> > > --------------
> > >
> > > ++++++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
> > > --- chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
> > > +++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch
> > > @@ -10,14 +10,14 @@
> > > - ],
> > > + 'include_dirs': [
> > > + 'config',
> > > -+ 'patched-ffmpeg-mt',
> > > ++ 'ffmpeg-0.6-headers',
> > > + ],
> > > 'direct_dependent_settings': {
> > > - 'cflags': [
> > > - '<!@(pkg-config --cflags libavcodec libavformat
> > > libavutil)',
> > > + 'include_dirs': [
> > > + 'config',
> > > -+ 'patched-ffmpeg-mt',
> > > ++ 'ffmpeg-0.6-headers',
> > > ],
> > > },
> > > }, { # else use_system_ffmpeg==0, add local copy to
> > include
> > > path
> > >
> > > ++++++ chromium-6.0.488.0-system-zlib.patch (new)
> > > --- chromium-6.0.488.0-system-zlib.patch
> > > +++ chromium-6.0.488.0-system-zlib.patch
> > > +diff -up
> > >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gypi.system-zlib
> > > chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gypi
> > > +---
> > >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gypi.system-zlib
> > > 2010-08-08 04:29:15.000000000 -0400
> > > ++++ chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gypi
> > > 2010-08-09 11:32:57.287157562 -0400
> > > +@@ -2596,17 +2596,6 @@
> > > + 'platform/image-decoders/png/PNGImageDecoder.h',
> > > + 'platform/image-decoders/skia/ImageDecoderSkia.cpp',
> > > + 'platform/image-decoders/wx/ImageDecoderWx.cpp',
> > > +- 'platform/image-decoders/zlib/crc32.h',
> > > +- 'platform/image-decoders/zlib/deflate.h',
> > > +- 'platform/image-decoders/zlib/inffast.h',
> > > +- 'platform/image-decoders/zlib/inffixed.h',
> > > +- 'platform/image-decoders/zlib/inflate.h',
> > > +- 'platform/image-decoders/zlib/inftrees.h',
> > > +- 'platform/image-decoders/zlib/mozzconf.h',
> > > +- 'platform/image-decoders/zlib/trees.h',
> > > +- 'platform/image-decoders/zlib/zconf.h',
> > > +- 'platform/image-decoders/zlib/zlib.h',
> > > +- 'platform/image-decoders/zlib/zutil.h',
> > > + 'platform/image-encoders/skia/PNGImageEncoder.cpp',
> > > + 'platform/image-encoders/skia/PNGImageEncoder.h',
> > > + 'platform/mac/AutodrainedPool.mm',
> > > +diff -up
> > >
> >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > .system-zlib
> > >
> >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > +---
> > >
> >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > .system-zlib 2010-08-09 11:32:57.000000000 -0400
> > > ++++
> > >
> >
> chromium-6.0.488.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > 2010-08-09 11:34:28.668045709 -0400
> > > +@@ -680,6 +680,7 @@
> > > + '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
> > > + '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
> > > + '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
> > > ++ '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
> > > + ],
> > > + 'include_dirs': [
> > > + '<(INTERMEDIATE_DIR)',
> > >
> > > ++++++ chromium-7.0.500.0-system-speex.patch (new)
> > > --- chromium-7.0.500.0-system-speex.patch
> > > +++ chromium-7.0.500.0-system-speex.patch
> > > +diff -up
> > chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp.speex
> > > chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp
> > > +--- chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp.speex
> > > 2010-08-19 16:23:14.594998783 -0400
> > > ++++ chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp
> > > 2010-08-19 16:23:14.676903548 -0400
> > > +@@ -348,6 +348,26 @@
> > > + }]]
> > > + },
> > > + {
> > > ++ 'target_name': 'speex',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags speex)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l speex)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > + 'target_name': 'gnome-keyring',
> > > + 'type': 'settings',
> > > + 'conditions': [
> > > +diff -up
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/browser/speech/speech_rec
> > > ognizer.cc.speex
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/browser/speech/speech_rec
> > > ognizer.cc
> > > +---
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/browser/speech/speech_rec
> > > ognizer.cc.speex 2010-08-19 15:03:08.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/browser/speech/speech_rec
> > > ognizer.cc 2010-08-19 16:23:14.676903548 -0400
> > > +@@ -9,7 +9,7 @@
> > > + #include "chrome/browser/chrome_thread.h"
> > > + #include "chrome/browser/profile.h"
> > > + #include "chrome/common/net/url_request_context_getter.h"
> > > +-#include "third_party/speex/include/speex/speex.h"
> > > ++#include <speex/speex.h>
> > > +
> > > + using media::AudioInputController;
> > > + using std::list;
> > > +diff -up
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi.speex
> > > chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi
> > > +---
> > >
> >
> chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi.speex
> > > 2010-08-19 16:23:14.594998783 -0400
> > > ++++
> chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi
> > > 2010-08-19 16:25:27.921293238 -0400
> > > +@@ -36,7 +36,7 @@
> > > + '../third_party/libxml/libxml.gyp:libxml',
> > > + '../third_party/npapi/npapi.gyp:npapi',
> > > + '../third_party/hunspell/hunspell.gyp:hunspell',
> > > +- '../third_party/speex/speex.gyp:libspeex',
> > > ++ '../build/linux/system.gyp:speex',
> > > +
> > > '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
> > > + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
> > > + '../webkit/support/webkit_support.gyp:appcache',
> > >
> > > ++++++ chromium-7.0.503.0-system-expat.patch (new)
> > > --- chromium-7.0.503.0-system-expat.patch
> > > +++ chromium-7.0.503.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
> > >
> > > ++++++ chromium-7.0.510.0-fstat.patch (new)
> > > --- chromium-7.0.510.0-fstat.patch
> > > +++ chromium-7.0.510.0-fstat.patch
> > > +diff -up
> > >
> >
> chromium-7.0.510.0/breakpad/src/tools/linux/md2core/minidump-2-core.cc.fs
> > > tat
> > >
> chromium-7.0.510.0/breakpad/src/tools/linux/md2core/minidump-2-core.cc
> > > +---
> > >
> >
> chromium-7.0.510.0/breakpad/src/tools/linux/md2core/minidump-2-core.cc.fs
> > > tat 2010-09-01 11:01:31.640057184 -0400
> > > ++++
> > >
> chromium-7.0.510.0/breakpad/src/tools/linux/md2core/minidump-2-core.cc
> > > 2010-09-01 11:01:40.091043910 -0400
> > > +@@ -41,6 +41,7 @@
> > > + #include <stdlib.h>
> > > + #include <string.h>
> > > + #include <sys/mman.h>
> > > ++#include <sys/stat.h>
> > > + #include <sys/user.h>
> > > + #include <unistd.h>
> > > +
> > >
> > > ++++++ chromium-7.0.510.0-sharedlibfixes.patch (new)
> > > --- chromium-7.0.510.0-sharedlibfixes.patch
> > > +++ chromium-7.0.510.0-sharedlibfixes.patch
> > > +diff -up chromium-7.0.510.0/chrome/chrome_browser.gypi.sharedlibsfixes
> > > chromium-7.0.510.0/chrome/chrome_browser.gypi
> > > +--- chromium-7.0.510.0/chrome/chrome_browser.gypi.sharedlibsfixes
> > > 2010-08-31 15:38:36.023297885 -0400
> > > ++++ chromium-7.0.510.0/chrome/chrome_browser.gypi 2010-08-31
> > > 15:40:29.212043249 -0400
> > > +@@ -22,6 +22,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/npapi/npapi.gyp:npapi',
> > > + '../third_party/hunspell/hunspell.gyp:hunspell',
> > > + '../third_party/speex/speex.gyp:libspeex',
> > > ++
> > > '../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:blob',
> > > + '../webkit/support/webkit_support.gyp:database',
> > > +@@ -3094,6 +3097,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',
> > > +@@ -3143,6 +3151,8 @@
> > > + 'libraries': [
> > > + # For dlsym() in 'browser/zygote_main_linux.cc'
> > > + '-ldl',
> > > ++ '<!@(pkg-config --libs-only-l icu)',
> > > ++ '-Lout/Release/lib.target/ -lwtf',
> > > + ],
> > > + },
> > > + 'sources!': [
> > > +diff -up
> chromium-7.0.510.0/chrome/chrome_common.gypi.sharedlibsfixes
> > > chromium-7.0.510.0/chrome/chrome_common.gypi
> > > +--- chromium-7.0.510.0/chrome/chrome_common.gypi.sharedlibsfixes
> > > 2010-08-31 15:38:36.023297885 -0400
> > > ++++ chromium-7.0.510.0/chrome/chrome_common.gypi 2010-08-31
> > > 15:38:36.515040539 -0400
> > > +@@ -154,6 +154,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',
> > > +@@ -326,6 +327,8 @@
> > > + '-lXrender',
> > > + '-lXss',
> > > + '-lXext',
> > > ++ '-Lout/Release/lib.target/ -lskia',
> > > ++ '-Lout/Release/lib.target/ -lipc',
> > > + ],
> > > + },
> > > + },],
> > >
> > > ++++++ chromium-7.0.510.0-system-ffmpeg.patch (new)
> > > --- chromium-7.0.510.0-system-ffmpeg.patch
> > > +++ chromium-7.0.510.0-system-ffmpeg.patch
> > > +diff -up chromium-7.0.510.0/media/filters/ffmpeg_glue.cc.system-ffmpeg
> > > chromium-7.0.510.0/media/filters/ffmpeg_glue.cc
> > > +--- chromium-7.0.510.0/media/filters/ffmpeg_glue.cc.system-ffmpeg
> > > 2010-08-31 04:22:39.000000000 -0400
> > > ++++ chromium-7.0.510.0/media/filters/ffmpeg_glue.cc 2010-09-01
> > > 10:50:30.259172512 -0400
> > > +@@ -119,14 +119,14 @@ 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 +134,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.
> > >
> > > ++++++
> chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
> > ->
> > > chromium-7.0.542.0-codechanges-system-minizip-nss-nspr-v8.patch
> > > --- chromium-6.0.486.0-codechanges-system-minizip-nss-nspr-v8.patch
> > > +++ chromium-7.0.542.0-codechanges-system-minizip-nss-nspr-v8.patch
> > > @@ -1,6 +1,6 @@
> > > -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
> > > +diff -up chromium-7.0.542.0/base/pr_time_unittest.cc.system-code
> > > chromium-7.0.542.0/base/pr_time_unittest.cc
> > > +--- chromium-7.0.542.0/base/pr_time_unittest.cc.system-code
> > > 2010-10-04 05:41:40.000000000 -0400
> > > ++++ chromium-7.0.542.0/base/pr_time_unittest.cc 2010-10-04
> > > 13:50:45.319372431 -0400
> > > @@ -4,7 +4,7 @@
> > >
> > > #include <time.h>
> > > @@ -10,22 +10,22 @@
> > > #include "base/time.h"
> > > #include "testing/gtest/include/gtest/gtest.h"
> > >
> > > -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 @@
> > > +diff -up chromium-7.0.542.0/base/time.cc.system-code
> > > chromium-7.0.542.0/base/time.cc
> > > +--- chromium-7.0.542.0/base/time.cc.system-code 2010-10-04
> > > 05:41:40.000000000 -0400
> > > ++++ chromium-7.0.542.0/base/time.cc 2010-10-04 13:50:45.320378367
> > > -0400
> > > +@@ -4,7 +4,7 @@
> > > +
> > > #include "base/time.h"
> > > - #include "base/string_util.h"
> > > #include "base/sys_string_conversions.h"
> > > -#include "base/third_party/nspr/prtime.h"
> > > +#include <prtime.h>
> > >
> > > #include "base/logging.h"
> > >
> > > -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 @@
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/browser/browser_about_handler.cc.system-code
> > > chromium-7.0.542.0/chrome/browser/browser_about_handler.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/browser/browser_about_handler.cc.system-code
> > > 2010-10-04 05:42:38.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/browser_about_handler.cc
> > > 2010-10-04 13:50:45.322377060 -0400
> > > +@@ -57,7 +57,7 @@
> > > #include "grit/locale_settings.h"
> > > #include "webkit/glue/webkit_glue.h"
> > > #ifdef CHROME_V8
> > > @@ -34,9 +34,21 @@
> > > #endif
> > >
> > > #if defined(OS_WIN)
> > > -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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/browser/dom_ui/options/about_page_handler.cc
> > > .system-code
> > >
> >
> chromium-7.0.542.0/chrome/browser/dom_ui/options/about_page_handler.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/browser/dom_ui/options/about_page_handler.cc
> > > .system-code 2010-10-04 14:20:06.569129133 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/browser/dom_ui/options/about_page_handler.cc
> > > 2010-10-04 14:20:21.197112798 -0400
> > > +@@ -28,7 +28,7 @@
> > > + #include "webkit/glue/webkit_glue.h"
> > > +
> > > + #if defined(CHROME_V8)
> > > +-#include "v8/include/v8.h"
> > > ++#include <v8.h>
> > > + #endif
> > > +
> > > + #if defined(OS_CHROMEOS)
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/memory_purger.cc.system-code
> > > chromium-7.0.542.0/chrome/browser/memory_purger.cc
> > > +--- chromium-7.0.542.0/chrome/browser/memory_purger.cc.system-code
> > > 2010-10-04 05:42:38.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/memory_purger.cc
> > 2010-10-04
> > > 14:16:54.837353728 -0400
> > > @@ -23,7 +23,7 @@
> > > #include "net/proxy/proxy_resolver.h"
> > > #include "net/url_request/url_request_context.h"
> > > @@ -46,10 +58,10 @@
> > >
> > > // PurgeMemoryHelper -----------------------------------------------------------
> > >
> > > -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 @@
> > > +diff -up chromium-7.0.542.0/chrome/common/zip.cc.system-code
> > > chromium-7.0.542.0/chrome/common/zip.cc
> > > +--- chromium-7.0.542.0/chrome/common/zip.cc.system-code
> 2010-10-04
> > > 05:42:43.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/common/zip.cc 2010-10-04
> > > 14:16:54.838353592 -0400
> > > +@@ -10,8 +10,8 @@
> > > #include "base/string_util.h"
> > > #include "base/utf_string_conversions.h"
> > > #include "net/base/file_stream.h"
> > > @@ -60,9 +72,9 @@
> > > #if defined(OS_WIN)
> > > #include "third_party/zlib/contrib/minizip/iowin32.h"
> > > #endif
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h.system-code
> > >
> >
> chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h
> > > ----
> > >
> >
> chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h.system-code 2010-08-06 04:37:26.000000000 -0400
> > > -+++
> > >
> >
> chromium-6.0.486.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h 2010-08-06 11:09:21.862120081 -0400
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h.system-code
> > >
> >
> chromium-7.0.542.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h.system-code 2010-10-04 05:42:44.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/renderer/automation/dom_automation_v8_exte
> > > nsion.h 2010-10-04 14:16:54.839353510 -0400
> > > @@ -6,7 +6,7 @@
> > > #define
> > >
> >
> CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_V8_EXTENSION_H
> > > _
> > > #pragma once
> > > @@ -72,9 +84,9 @@
> > >
> > > class DomAutomationV8Extension {
> > > public:
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h.system-cod
> > > e chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h
> > > ----
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/bindings_utils.h.system-cod
> > > e 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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/bindings_utils.h.system-cod
> > > e chromium-7.0.542.0/chrome/renderer/extensions/bindings_utils.h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/bindings_utils.h.system-cod
> > > e 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/renderer/extensions/bindings_utils.h
> > > 2010-10-04 14:16:54.840353450 -0400
> > > @@ -10,7 +10,7 @@
> > > #include "base/linked_ptr.h"
> > > #include "base/singleton.h"
> > > @@ -84,9 +96,21 @@
> > >
> > > #include <list>
> > > #include <string>
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h.system-co
> > > de chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h
> > > ----
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/event_bindings.h.system-co
> > > de 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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc.sy
> > > stem-code
> > >
> chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc.sy
> > > stem-code 2010-10-04 05:42:44.000000000 -0400
> > > ++++
> > >
> chromium-7.0.542.0/chrome/renderer/extensions/chrome_app_bindings.cc
> > > 2010-10-04 14:16:54.841498794 -0400
> > > +@@ -7,7 +7,7 @@
> > > + #include "chrome/renderer/extensions/extension_renderer_info.h"
> > > + #include "chrome/renderer/render_thread.h"
> > > + #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
> > > +-#include "v8/include/v8.h"
> > > ++#include <v8.h>
> > > +
> > > + using WebKit::WebFrame;
> > > +
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/event_bindings.h.system-co
> > > de chromium-7.0.542.0/chrome/renderer/extensions/event_bindings.h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/event_bindings.h.system-co
> > > de 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/renderer/extensions/event_bindings.h
> > > 2010-10-04 14:16:54.841498794 -0400
> > > @@ -8,7 +8,7 @@
> > >
> > > #include <string>
> > > @@ -96,9 +120,9 @@
> > >
> > > class GURL;
> > > class RenderThreadBase;
> > > -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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/extension_process_bindings
> > > .h.system-code
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/extension_process_bindings
> > > .h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/extension_process_bindings
> > > .h.system-code 2010-10-04 05:42:44.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/extension_process_bindings
> > > .h 2010-10-04 14:16:54.842499822 -0400
> > > @@ -13,7 +13,7 @@
> > > #include <vector>
> > >
> > > @@ -108,9 +132,9 @@
> > >
> > > class GURL;
> > > class URLPattern;
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/js_only_v8_extensions.h.sys
> > > tem-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.sys
> > > tem-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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/js_only_v8_extensions.h.sys
> > > tem-code
> > > chromium-7.0.542.0/chrome/renderer/extensions/js_only_v8_extensions.h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/js_only_v8_extensions.h.sys
> > > tem-code 2010-10-04 05:42:44.000000000 -0400
> > > ++++
> > > chromium-7.0.542.0/chrome/renderer/extensions/js_only_v8_extensions.h
> > > 2010-10-04 14:16:54.843500372 -0400
> > > @@ -6,7 +6,7 @@
> > > #define
> > CHROME_RENDERER_EXTENSIONS_JS_ONLY_V8_EXTENSIONS_H_
> > > #pragma once
> > > @@ -120,9 +144,9 @@
> > >
> > > // This file contains various V8 Extensions that are JavaScript only, and
> > > // don't have any C++ native functions.
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h.system-code
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h
> > > ----
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h.system-code 2010-08-06 04:37:26.000000000 -0400
> > > -+++
> > >
> >
> chromium-6.0.486.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h 2010-08-06 11:10:13.218922957 -0400
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h.system-code
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h.system-code 2010-10-04 05:42:44.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/renderer/extensions/renderer_extension_binding
> > > s.h 2010-10-04 14:16:54.844504849 -0400
> > > @@ -6,7 +6,7 @@
> > > #define
> > >
> CHROME_RENDERER_EXTENSIONS_RENDERER_EXTENSION_BINDINGS_H_
> > > #pragma once
> > > @@ -132,11 +156,11 @@
> > >
> > > #include <string>
> > >
> > > -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"
> > > +diff -up
> > > chromium-7.0.542.0/chrome/renderer/external_extension.cc.system-code
> > > chromium-7.0.542.0/chrome/renderer/external_extension.cc
> > > +---
> > chromium-7.0.542.0/chrome/renderer/external_extension.cc.system-code
> > > 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/renderer/external_extension.cc
> > > 2010-10-04 14:16:54.845500082 -0400
> > > +@@ -9,7 +9,7 @@
> > > + #include "chrome/common/render_messages_params.h"
> > > #include "chrome/renderer/render_view.h"
> > > #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
> > > -#include "v8/include/v8.h"
> > > @@ -144,9 +168,9 @@
> > >
> > > using WebKit::WebFrame;
> > > using WebKit::WebView;
> > > -diff -up
> > >
> >
> chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc.syste
> > > m-code
> > > chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc
> > > ----
> > >
> >
> chromium-6.0.486.0/chrome/renderer/loadtimes_extension_bindings.cc.syste
> > > m-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
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/renderer/loadtimes_extension_bindings.cc.syste
> > > m-code
> > > chromium-7.0.542.0/chrome/renderer/loadtimes_extension_bindings.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/renderer/loadtimes_extension_bindings.cc.syste
> > > m-code 2010-10-04 05:42:44.000000000 -0400
> > > (261 more lines skipped)
> > >
> > > ++++++ chromium-7.0.542.0-fix-wrapper.patch (new)
> > > --- chromium-7.0.542.0-fix-wrapper.patch
> > > +++ chromium-7.0.542.0-fix-wrapper.patch
> > > +diff -up chromium-7.0.542.0/chrome/tools/build/linux/chrome-wrapper.fix
> > > chromium-7.0.542.0/chrome/tools/build/linux/chrome-wrapper
> > > +--- chromium-7.0.542.0/chrome/tools/build/linux/chrome-wrapper.fix
> > > 2010-10-04 05:42:43.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/tools/build/linux/chrome-wrapper
> > > 2010-10-04 14:44:27.730490444 -0400
> > > +@@ -7,24 +7,8 @@
> > > + # Running Chromium via this script makes it possible to set Chromium as
> > the
> > > + # default browser directly out of a compile, without needing to package it.
> > > +
> > > +-DESKTOP="chromium-devel"
> > > + TITLE="Chromium"
> > > +
> > > +-# Check to see if there is a desktop file of the given name.
> > > +-exists_desktop_file() {
> > > +- # Build a search list from $XDG_DATA_HOME and $XDG_DATA_DIRS,
> > > the latter
> > > +- # of which can itself be a colon-separated list of directories to
> search.
> > > +-
> > >
> >
> search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/l
> > > ocal/share:/usr/share}"
> > > +- IFS=:
> > > +- for dir in $search; do
> > > +- unset IFS
> > > +- [ "$dir" -a -d "$dir/applications" ] || continue
> > > +- [ -r "$dir/applications/$DESKTOP.desktop" ] && return
> > > +- done
> > > +- # Didn't find it in the search path.
> > > +- return 1
> > > +-}
> > > +-
> > > + # Checks a file to see if it's a 32 or 64-bit.
> > > + check_executable() {
> > > + out=$(file $(readlink -f $1) 2> /dev/null)
> > > +@@ -41,27 +25,8 @@ check_executable() {
> > > + echo neither
> > > + }
> > > +
> > > +-# Generate a desktop file that will run this script.
> > > +-generate_desktop_file() {
> > > +- apps="${XDG_DATA_HOME:-$HOME/.local/share}/applications"
> > > +- mkdir -p "$apps"
> > > +- cat > "$apps/$DESKTOP.desktop" << EOF
> > > +-[Desktop Entry]
> > > +-Version=1.0
> > > +-Encoding=UTF-8
> > > +-Name=$TITLE
> > > +-Exec=$CHROME_WRAPPER %U
> > > +-Terminal=false
> > > +-Icon=$HERE/product_logo_48.png
> > > +-Type=Application
> > > +-Categories=Application;Network;WebBrowser;
> > > +-MimeType=text/html;text/xml;application/xhtml_xml;
> > > +-EOF
> > > +-}
> > > +-
> > > + # Let the wrapped binary know that it has been run through the wrapper.
> > > + export CHROME_WRAPPER="`readlink -f "$0"`"
> > > +-export CHROME_DESKTOP="$DESKTOP.desktop"
> > > +
> > > + HERE="`dirname "$CHROME_WRAPPER"`"
> > > +
> > > +@@ -80,54 +45,6 @@ case ":$PATH:" in
> > > + ;;
> > > + esac
> > > +
> > > +-# Always use our ffmpeg and other shared libs.
> > > +-export
> > >
> >
> LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target${LD_LIBRARY_PATH:+
> > > :${LD_LIBRARY_PATH}}"
> > > +-
> > > +-MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" |
> cut
> > > -d" " -f 1|sed 's/\t//')
> > > +-CHROME_ARCH=$(check_executable "$HERE/chrome")
> > > +-uname -m | grep -qs x86_64
> > > +-if [ $? = 1 ]; then
> > > +- LIBDIRS="/lib /lib32 /usr/lib /usr/lib32"
> > > +-else
> > > +- LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib"
> > > +-fi
> > > +-
> > > +-echo $MISSING_LIBS | grep -qs libbz2.so.1.0
> > > +-if [ $? = 0 ]; then
> > > +- for dir in $LIBDIRS
> > > +- do
> > > +- if [ -e "$dir/libbz2.so.1" ]; then
> > > +- LIB_ARCH=$(check_executable "$dir/libbz2.so.1")
> > > +- if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
> > > +- ln -snf "$dir/libbz2.so.1" "$HERE/libbz2.so.1.0"
> > > +- break;
> > > +- fi
> > > +- fi
> > > +- done
> > > +-fi
> > > +-
> > > +-for lib in libnspr4.so.0d libnss3.so.1d libnssutil3.so.1d libplc4.so.0d
> > > libplds4.so.0d libsmime3.so.1d libssl3.so.1d
> > > +-do
> > > +- echo $MISSING_LIBS | grep -qs $lib
> > > +- if [ $? = 0 ]; then
> > > +- reallib=$(echo $lib | sed 's/\.[01]d$//')
> > > +- for dir in $LIBDIRS
> > > +- do
> > > +- if [ -e "$dir/$reallib" ]; then
> > > +- LIB_ARCH=$(check_executable "$dir/$reallib")
> > > +- if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
> > > +- ln -snf "$dir/$reallib" "$HERE/$lib"
> > > +- break;
> > > +- fi
> > > +- fi
> > > +- done
> > > +- fi
> > > +-done
> > > +-
> > > +-# Custom version string for this release. This can be used to add a
> > > downstream
> > > +-# vendor string or release channel information.
> > > +-export CHROME_VERSION_EXTRA="custom"
> > > +-
> > > +-exists_desktop_file || generate_desktop_file
> > > ++export
> > >
> >
> LD_LIBRARY_PATH="$HERE:$HERE/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_P
> > A
> > > TH}"
> > > +
> > > + exec "$HERE/chrome" "$@"
> > >
> > > ++++++ chromium-7.0.542.0-fix_NULL_conversion_errors.patch (new)
> > > --- chromium-7.0.542.0-fix_NULL_conversion_errors.patch
> > > +++ chromium-7.0.542.0-fix_NULL_conversion_errors.patch
> > > +diff -up chromium-7.0.542.0/third_party/ppapi/cpp/module.cc.NULL
> > > chromium-7.0.542.0/third_party/ppapi/cpp/module.cc
> > > +--- chromium-7.0.542.0/third_party/ppapi/cpp/module.cc.NULL
> > > 2010-10-04 06:22:06.000000000 -0400
> > > ++++ chromium-7.0.542.0/third_party/ppapi/cpp/module.cc 2010-10-04
> > > 15:05:20.793175031 -0400
> > > +@@ -214,7 +214,7 @@ static PPP_Graphics3D_Dev graphics_3d_in
> > > +
> > > + // Module ----------------------------------------------------------------------
> > > +
> > > +-Module::Module() : pp_module_(NULL), get_browser_interface_(NULL),
> > > core_(NULL) {
> > > ++Module::Module() : pp_module_(0), get_browser_interface_(NULL),
> > > core_(NULL) {
> > > + }
> > > +
> > > + Module::~Module() {
> > > +diff -up chromium-7.0.542.0/third_party/ppapi/cpp/resource.cc.NULL
> > > chromium-7.0.542.0/third_party/ppapi/cpp/resource.cc
> > > +--- chromium-7.0.542.0/third_party/ppapi/cpp/resource.cc.NULL
> > > 2010-10-04 06:22:06.000000000 -0400
> > > ++++ chromium-7.0.542.0/third_party/ppapi/cpp/resource.cc
> 2010-10-04
> > > 15:05:47.369506124 -0400
> > > +@@ -11,7 +11,7 @@
> > > +
> > > + 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 @@ void Resource::swap(Resource& other) {
> > > +
> > > + PP_Resource Resource::detach() {
> > > + PP_Resource ret = pp_resource_;
> > > +- pp_resource_ = NULL;
> > > ++ pp_resource_ = 0;
> > > + return ret;
> > > + }
> > > +
> > > +diff -up chromium-7.0.542.0/webkit/glue/webvideoframe_impl.cc.NULL
> > > chromium-7.0.542.0/webkit/glue/webvideoframe_impl.cc
> > > +--- chromium-7.0.542.0/webkit/glue/webvideoframe_impl.cc.NULL
> > > 2010-10-06 14:43:20.989506729 -0400
> > > ++++ chromium-7.0.542.0/webkit/glue/webvideoframe_impl.cc
> > 2010-10-06
> > > 14:43:40.916506720 -0400
> > > +@@ -90,7 +90,7 @@ const void* WebVideoFrameImpl::data(unsi
> > > + unsigned WebVideoFrameImpl::texture(unsigned plane) const {
> > > + if (video_frame_.get())
> > > + return video_frame_->gl_texture(plane);
> > > +- return NULL;
> > > ++ return 0;
> > > + }
> > > +
> > > + } // namespace webkit_glue
> > >
> > > ++++++ chromium-7.0.542.0-gyp-system-icu.patch (new)
> > > --- chromium-7.0.542.0-gyp-system-icu.patch
> > > +++ chromium-7.0.542.0-gyp-system-icu.patch
> > > +diff -up chromium-7.0.542.0/app/app_base.gypi.system-icu
> > > chromium-7.0.542.0/app/app_base.gypi
> > > +--- chromium-7.0.542.0/app/app_base.gypi.system-icu 2010-10-04
> > > 05:39:55.000000000 -0400
> > > ++++ chromium-7.0.542.0/app/app_base.gypi 2010-10-04
> > > 14:33:15.142228266 -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-7.0.542.0/app/app.gyp.system-icu
> > > chromium-7.0.542.0/app/app.gyp
> > > +--- chromium-7.0.542.0/app/app.gyp.system-icu 2010-10-04
> > > 05:39:55.000000000 -0400
> > > ++++ chromium-7.0.542.0/app/app.gyp 2010-10-04 14:33:15.143228214
> > -0400
> > > +@@ -31,8 +31,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-7.0.542.0/base/base.gyp.system-icu
> > > chromium-7.0.542.0/base/base.gyp
> > > +--- chromium-7.0.542.0/base/base.gyp.system-icu 2010-10-04
> > > 05:41:40.000000000 -0400
> > > ++++ chromium-7.0.542.0/base/base.gyp 2010-10-04
> 14:33:15.143228214
> > > -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"', {
> > > +@@ -174,7 +173,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-7.0.542.0/build/all.gyp.system-icu
> > > chromium-7.0.542.0/build/all.gyp
> > > +--- chromium-7.0.542.0/build/all.gyp.system-icu 2010-10-04
> > > 14:33:15.113249990 -0400
> > > ++++ chromium-7.0.542.0/build/all.gyp 2010-10-04 14:33:15.144244179
> > -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-7.0.542.0/build/linux/system.gyp.system-icu
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.system-icu 2010-10-04
> > > 14:33:15.113249990 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-04
> > > 14:33:15.145244891 -0400
> > > +@@ -269,6 +269,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-7.0.542.0/build/temp_gyp/googleurl.gyp.system-icu
> > > chromium-7.0.542.0/build/temp_gyp/googleurl.gyp
> > > +--- chromium-7.0.542.0/build/temp_gyp/googleurl.gyp.system-icu
> > > 2010-10-04 05:41:30.000000000 -0400
> > > ++++ chromium-7.0.542.0/build/temp_gyp/googleurl.gyp 2010-10-04
> > > 14:33:15.145244891 -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-7.0.542.0/chrome/chrome_browser.gypi.system-icu
> > > chromium-7.0.542.0/chrome/chrome_browser.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_browser.gypi.system-icu
> > > 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_browser.gypi 2010-10-04
> > > 14:33:15.148241397 -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-7.0.542.0/chrome/chrome_common.gypi.system-icu
> > > chromium-7.0.542.0/chrome/chrome_common.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_common.gypi.system-icu
> > > 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_common.gypi 2010-10-04
> > > 14:33:15.149242748 -0400
> > > +@@ -165,8 +165,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-7.0.542.0/chrome/chrome.gyp.system-icu
> > > chromium-7.0.542.0/chrome/chrome.gyp
> > > +--- chromium-7.0.542.0/chrome/chrome.gyp.system-icu 2010-10-04
> > > 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome.gyp 2010-10-04
> > > 14:33:15.151248455 -0400
> > > +@@ -536,8 +536,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': [
> > > + '..',
> > > +@@ -587,8 +586,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',
> > > +@@ -861,7 +859,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-7.0.542.0/chrome/chrome_renderer.gypi.system-icu
> > > chromium-7.0.542.0/chrome/chrome_renderer.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_renderer.gypi.system-icu
> > > 2010-10-04 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_renderer.gypi 2010-10-04
> > > 14:33:15.151248455 -0400
> > > +@@ -20,8 +20,7 @@
> > > + '../third_party/hunspell/hunspell.gyp:hunspell',
> > > + '../third_party/cld/cld.gyp:cld',
> > > + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
> > > +- '../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-7.0.542.0/chrome/chrome_tests.gypi.system-icu
> > > chromium-7.0.542.0/chrome/chrome_tests.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_tests.gypi.system-icu
> > 2010-10-04
> > > 05:42:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_tests.gypi 2010-10-04
> > > 14:33:15.153239834 -0400
> > > +@@ -453,8 +453,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',
> > > +@@ -861,8 +860,7 @@
> > > + '../net/net.gyp:net',
> > > (293 more lines skipped)
> > >
> > > ++++++ chromium-7.0.542.0-media-probe.patch (new)
> > > --- chromium-7.0.542.0-media-probe.patch
> > > +++ chromium-7.0.542.0-media-probe.patch
> > > +diff -up chromium-7.0.542.0/net/base/mime_util.cc.media-probe
> > > chromium-7.0.542.0/net/base/mime_util.cc
> > > +--- chromium-7.0.542.0/net/base/mime_util.cc.media-probe
> 2010-10-04
> > > 05:40:38.000000000 -0400
> > > ++++ chromium-7.0.542.0/net/base/mime_util.cc 2010-10-04
> > > 15:02:09.324499172 -0400
> > > +@@ -15,6 +15,15 @@
> > > + #include "base/string_util.h"
> > > + #include "base/utf_string_conversions.h"
> > > +
> > > ++#include "base/path_service.h"
> > > ++
> > > ++#if ! defined(OS_MACOSX) && defined (OS_POSIX)
> > > ++#include <dlfcn.h>
> > > ++#define HAVE_DLFCN 1
> > > ++#else
> > > ++#define HAVE_DLFCN 0
> > > ++#endif
> > > ++
> > > + using std::string;
> > > +
> > > + namespace net {
> > > +@@ -199,45 +208,49 @@ static const char* const supported_image
> > > + "image/x-xbitmap" // xbm
> > > + };
> > > +
> > > ++struct format_info {
> > > ++ const char* name;
> > > ++ const char* symbol;
> > > ++ const bool fallback;
> > > ++};
> > > ++
> > > ++#if defined(GOOGLE_CHROME_BUILD) ||
> > > defined(USE_PROPRIETARY_CODECS)
> > > ++#define MPEG true
> > > ++#else
> > > ++#define MPEG false
> > > ++#endif
> > > + // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
> > > + // A comprehensive mime type list:
> > > http://plugindoc.mozdev.org/winmime.php
> > > +-static const char* const supported_media_types[] = {
> > > ++static const format_info supported_media_types[] = {
> > > + // Ogg.
> > > +- "video/ogg",
> > > +- "audio/ogg",
> > > +- "application/ogg",
> > > +- "video/webm",
> > > +- "audio/webm",
> > > +- "audio/wav",
> > > +- "audio/x-wav",
> > > +-
> > > +-#if defined(GOOGLE_CHROME_BUILD) ||
> > > defined(USE_PROPRIETARY_CODECS)
> > > ++ { "video/ogg", "ogg_demuxer", true },
> > > ++ { "audio/ogg", "ogg_demuxer", true },
> > > ++ { "application/ogg", "ogg_demuxer", true },
> > > ++ { "video/webm", "matroska_demuxer", true },
> > > ++ { "audio/webm", "matroska_demuxer", true },
> > > ++ { "audio/wav", "wav_demuxer", true },
> > > ++ { "audio/x-wav", "wav_demuxer", true },
> > > + // MPEG-4.
> > > +- "video/mp4",
> > > +- "video/x-m4v",
> > > +- "audio/mp4",
> > > +- "audio/x-m4a",
> > > +-
> > > ++ { "video/mp4", "mov_demuxer", MPEG },
> > > ++ { "video/x-m4v", "mov_demuxer", MPEG },
> > > ++ { "audio/mp4", "mov_demuxer", MPEG },
> > > ++ { "audio/x-m4a", "mov_demuxer", MPEG },
> > > + // MP3.
> > > +- "audio/mp3",
> > > +- "audio/x-mp3",
> > > +- "audio/mpeg",
> > > +-#endif
> > > ++ { "audio/mp3", "mp3_demuxer", MPEG },
> > > ++ { "audio/x-mp3", "mp3_demuxer", MPEG },
> > > ++ { "audio/mpeg", "mp3_demuxer", MPEG },
> > > + };
> > > +
> > > + // List of supported codecs when passed in with <source type="...">.
> > > + //
> > > + // Refer to
> > > http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
> > > + // for more information.
> > > +-static const char* const supported_media_codecs[] = {
> > > +-#if defined(GOOGLE_CHROME_BUILD) ||
> > > defined(USE_PROPRIETARY_CODECS)
> > > +- "avc1",
> > > +- "mp4a",
> > > +-#endif
> > > +- "theora",
> > > +- "vorbis",
> > > +- "vp8",
> > > +- "1" // PCM for WAV.
> > > ++static const format_info supported_media_codecs[] = {
> > > ++ { "avc1", "aac_decoder", MPEG },
> > > ++ { "mp4a", "h264_decoder", MPEG },
> > > ++ { "theora", "theora_decoder", true },
> > > ++ { "vorbis", "vorbis_decoder", true },
> > > ++ { "vp8", "libvpx_decoder", true },
> > > + };
> > > +
> > > + // Note: does not include javascript types list (see
> > > supported_javascript_types)
> > > +@@ -312,7 +325,47 @@ static const MediaFormatStrict format_co
> > > + { "audio/wav", "1" }
> > > + };
> > > +
> > > +-void MimeUtil::InitializeMimeTypeMaps() {
> > > ++#if defined(OS_MACOSX)
> > > ++#define DSO_NAME(MODULE) ("lib" MODULE ".dylib")
> > > ++#elif defined(OS_POSIX)
> > > ++#define DSO_NAME(MODULE) ("lib" MODULE ".so")
> > > ++#else
> > > ++#define DSO_NAME(MODULE) (MODULE ".dll")
> > > ++#endif
> > > ++
> > > ++static void* GetHandle(const FilePath& module_dir, const char* library) {
> > > ++#if HAVE_DLFCN
> > > ++ FilePath path = module_dir.Append(library);
> > > ++ return dlopen(path.value().c_str(), RTLD_LAZY);
> > > ++#else
> > > ++ return NULL;
> > > ++#endif
> > > ++}
> > > ++
> > > ++static void DumpHandle(void* dlhandle) {
> > > ++#if HAVE_DLFCN
> > > ++ if (dlhandle)
> > > ++ dlclose(dlhandle);
> > > ++#endif
> > > ++}
> > > ++
> > > ++static bool ProbeFormat(void* dlhandle, const char* symbol, bool fallback)
> {
> > > ++#if HAVE_DLFCN
> > > ++ return dlhandle && dlsym(dlhandle, symbol);
> > > ++#else
> > > ++ return fallback;
> > > ++#endif
> > > ++}
> > > ++
> > > ++ void MimeUtil::InitializeMimeTypeMaps() {
> > > ++ FilePath module_path;
> > > ++#if defined(OS_MACOSX)
> > > ++ module_path = mac_util::MainAppBundlePath().Append("Libraries");
> > > ++#else
> > > ++ PathService::Get(base::DIR_MODULE, &module_path);
> > > ++#endif
> > > ++ void* h_ffmpegsumo = GetHandle(module_path,
> > > DSO_NAME("ffmpegsumo"));
> > > ++
> > > + for (size_t i = 0; i < arraysize(supported_image_types); ++i)
> > > + image_map_.insert(supported_image_types[i]);
> > > +
> > > +@@ -322,11 +375,15 @@ void MimeUtil::InitializeMimeTypeMaps()
> > > + for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
> > > + non_image_map_.insert(supported_javascript_types[i]);
> > > + for (size_t i = 0; i < arraysize(supported_media_types); ++i)
> > > +- non_image_map_.insert(supported_media_types[i]);
> > > ++ if (ProbeFormat(h_ffmpegsumo, supported_media_types[i].symbol,
> > > ++ supported_media_types[i].fallback))
> > > ++ non_image_map_.insert(supported_media_types[i].name);
> > > +
> > > + // Initialize the supported media types.
> > > + for (size_t i = 0; i < arraysize(supported_media_types); ++i)
> > > +- media_map_.insert(supported_media_types[i]);
> > > ++ if (ProbeFormat(h_ffmpegsumo, supported_media_types[i].symbol,
> > > ++ supported_media_types[i].fallback))
> > > ++ media_map_.insert(supported_media_types[i].name);
> > > +
> > > + for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
> > > + javascript_map_.insert(supported_javascript_types[i]);
> > > +@@ -335,7 +392,9 @@ void MimeUtil::InitializeMimeTypeMaps()
> > > + view_source_map_.insert(view_source_types[i]);
> > > +
> > > + for (size_t i = 0; i < arraysize(supported_media_codecs); ++i)
> > > +- codecs_map_.insert(supported_media_codecs[i]);
> > > ++ if (ProbeFormat(h_ffmpegsumo,
> supported_media_codecs[i].symbol,
> > > ++ supported_media_codecs[i].fallback))
> > > ++ codecs_map_.insert(supported_media_codecs[i].name);
> > > +
> > > + // Initialize the strict supported media types.
> > > + for (size_t i = 0; i < arraysize(format_codec_mappings); ++i) {
> > > +@@ -349,6 +408,8 @@ void MimeUtil::InitializeMimeTypeMaps()
> > > + codecs.insert(mime_type_codecs[j]);
> > > + strict_format_map_[format_codec_mappings[i].mime_type] =
> > codecs;
> > > + }
> > > ++
> > > ++ DumpHandle(h_ffmpegsumo);
> > > + }
> > > +
> > > + bool MimeUtil::IsSupportedImageMimeType(const char* mime_type)
> const
> > {
> > >
> > > ++++++ chromium-6.0.453.1-system-gyp-v8.patch ->
> > > chromium-7.0.542.0-system-gyp-v8.patch
> > > --- chromium-6.0.453.1-system-gyp-v8.patch
> > > +++ chromium-7.0.542.0-system-gyp-v8.patch
> > > @@ -1,7 +1,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 @@
> > > +diff -up chromium-7.0.542.0/build/all.gyp.system-v8
> > > chromium-7.0.542.0/build/all.gyp
> > > +--- chromium-7.0.542.0/build/all.gyp.system-v8 2010-10-04
> > > 05:41:31.000000000 -0400
> > > ++++ chromium-7.0.542.0/build/all.gyp 2010-10-04 14:23:01.574355874
> > -0400
> > > +@@ -53,7 +53,7 @@
> > > 'conditions': [
> > > ['javascript_engine=="v8"', {
> > > 'dependencies': [
> > > @@ -10,10 +10,10 @@
> > > ],
> > > }],
> > > ['OS=="mac" or OS=="linux" or OS=="freebsd" or
> > OS=="openbsd"',
> > > {
> > > -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 @@
> > > +diff -up chromium-7.0.542.0/build/linux/system.gyp.system-v8
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.system-v8 2010-10-04
> > > 05:41:30.000000000 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-04
> > > 14:23:01.575354202 -0400
> > > +@@ -257,6 +257,18 @@
> > > }]]
> > > },
> > > {
> > > @@ -32,10 +32,10 @@
> > > '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 @@
> > > +diff -up chromium-7.0.542.0/net/net.gyp.system-v8
> > > chromium-7.0.542.0/net/net.gyp
> > > +--- chromium-7.0.542.0/net/net.gyp.system-v8 2010-10-04
> > > 05:40:44.000000000 -0400
> > > ++++ chromium-7.0.542.0/net/net.gyp 2010-10-04 14:23:01.576363187
> > -0400
> > > +@@ -652,7 +652,7 @@
> > > 'conditions': [
> > > ['javascript_engine=="v8"', {
> > > 'dependencies': [
> > > @@ -43,11 +43,11 @@
> > > + '../build/linux/system.gyp:v8',
> > > ],
> > > }],
> > > - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
> > > -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 @@
> > > + ['chromeos==1', {
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > .system-v8
> > >
> >
> chromium-7.0.542.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > +---
> > >
> >
> chromium-7.0.542.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > .system-v8 2010-10-04 05:51:42.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
> > > 2010-10-04 14:23:01.577354217 -0400
> > > +@@ -778,7 +778,7 @@
> > > 'conditions': [
> > > ['javascript_engine=="v8"', {
> > > 'dependencies': [
> > > @@ -56,7 +56,7 @@
> > > ],
> > > 'conditions': [
> > > ['inside_chromium_build==1 and OS=="win" and
> > > component=="shared_library"', {
> > > -@@ -883,10 +883,10 @@
> > > +@@ -882,10 +882,10 @@
> > > 'conditions': [
> > > ['javascript_engine=="v8"', {
> > > 'dependencies': [
> > > @@ -69,3 +69,45 @@
> > > ],
> > > 'conditions': [
> > > ['inside_chromium_build==1 and OS=="win" and
> > > component=="shared_library"', {
> > > +@@ -1383,10 +1383,10 @@
> > > + 'conditions': [
> > > + ['javascript_engine=="v8"', {
> > > + 'dependencies': [
> > > +- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
> > > ++ '<(chromium_src_dir)/build/linux/system.gyp:v8',
> > > + ],
> > > + 'export_dependent_settings': [
> > > +- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
> > > ++ '<(chromium_src_dir)/build/linux/system.gyp:v8',
> > > + ],
> > > + }],
> > > + ['OS=="mac"', {
> > > +diff -up chromium-7.0.542.0/v8/tools/gyp/v8.gyp.system-v8
> > > chromium-7.0.542.0/v8/tools/gyp/v8.gyp
> > > +--- chromium-7.0.542.0/v8/tools/gyp/v8.gyp.system-v8 2010-10-04
> > > 05:46:08.000000000 -0400
> > > ++++ chromium-7.0.542.0/v8/tools/gyp/v8.gyp 2010-10-04
> > > 14:23:01.578363647 -0400
> > > +@@ -732,7 +732,7 @@
> > > + 'target_name': 'v8_shell',
> > > + 'type': 'executable',
> > > + 'dependencies': [
> > > +- 'v8'
> > > ++ '../../../build/linux/system.gyp:v8',
> > > + ],
> > > + 'sources': [
> > > + '../../samples/shell.cc',
> > > +diff -up chromium-7.0.542.0/webkit/glue/webkit_glue.gypi.system-v8
> > > chromium-7.0.542.0/webkit/glue/webkit_glue.gypi
> > > +--- chromium-7.0.542.0/webkit/glue/webkit_glue.gypi.system-v8
> > > 2010-10-04 05:39:57.000000000 -0400
> > > ++++ chromium-7.0.542.0/webkit/glue/webkit_glue.gypi 2010-10-04
> > > 14:24:39.073239548 -0400
> > > +@@ -461,11 +461,11 @@
> > > + ['inside_chromium_build==1 and
> > > component=="shared_library"', {
> > > + 'dependencies': [
> > > +
> > > '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
> > > +- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
> > > ++ '<(DEPTH)/build/linux/system.gyp:v8',
> > > + ],
> > > + 'export_dependent_settings': [
> > > +
> > > '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
> > > +- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
> > > ++ '<(DEPTH)/build/linux/system.gyp:v8',
> > > + ],
> > > + }],
> > > + ],
> > >
> > > ++++++ chromium-7.0.542.0-system-libjingle.patch (new)
> > > --- chromium-7.0.542.0-system-libjingle.patch
> > > +++ chromium-7.0.542.0-system-libjingle.patch
> > > +diff -up chromium-7.0.542.0/build/linux/system.gyp.jingle
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.jingle 2010-10-05
> > > 17:21:58.638364791 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-05
> > > 17:23:04.688497228 -0400
> > > +@@ -289,6 +289,86 @@
> > > + }]]
> > > + },
> > > + {
> > > ++ 'target_name': 'jingle',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags jinglebase-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other
> > > jinglebase-0.4)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l jinglebase-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > ++ 'target_name': 'jinglep2p',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags jinglep2p-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other
> > jinglep2p-0.4)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l jinglep2p-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > ++ 'target_name': 'jinglesessionphone',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags jinglesessionphone-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other
> > > jinglesessionphone-0.4)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l jinglesessionphone-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > ++ 'target_name': 'jinglesessiontunnel',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags jinglesessiontunnel-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other
> > > jinglesessiontunnel-0.4)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l jinglesessiontunnel-0.4)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > + 'target_name': 'gnome-keyring',
> > > + 'type': 'settings',
> > > + 'conditions': [
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc.jingle
> > > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc
> > > +---
> > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc.jingle
> > > 2010-10-04 05:42:27.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.cc
> > > 2010-10-05 17:21:58.886231001 -0400
> > > +@@ -8,7 +8,7 @@
> > > + #include <vector>
> > > +
> > > + #include "chrome/browser/autofill/autofill_type.h"
> > > +-#include "third_party/libjingle/overrides/talk/xmllite/qname.h"
> > > ++#include <talk/xmllite/qname.h>
> > > +
> > > + AutoFillXmlParser::AutoFillXmlParser()
> > > + : succeeded_(true) {
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h.jingle
> > > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h
> > > +---
> > chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h.jingle
> > > 2010-10-05 17:21:58.840244180 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser.h
> > > 2010-10-05 17:21:58.887231050 -0400
> > > +@@ -12,7 +12,7 @@
> > > + #include "chrome/browser/autofill/field_types.h"
> > > + #include "chrome/browser/autofill/form_structure.h"
> > > + #include <expat.h>
> > > +-#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
> > > ++#include <talk/xmllite/xmlparser.h>
> > > +
> > > + // The base class that contains common functionality between
> > > + // AutoFillQueryXmlParser and AutoFillUploadXmlParser.
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc.j
> > > ingle
> > >
> >
> chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc.j
> > > ingle 2010-10-04 05:42:27.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/browser/autofill/autofill_xml_parser_unittest.cc
> > > 2010-10-05 17:21:58.888230747 -0400
> > > +@@ -8,7 +8,7 @@
> > > + #include "chrome/browser/autofill/autofill_xml_parser.h"
> > > + #include "chrome/browser/autofill/field_types.h"
> > > + #include "testing/gtest/include/gtest/gtest.h"
> > > +-#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
> > > ++#include <talk/xmllite/xmlparser.h>
> > > +
> > > + namespace {
> > > +
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc.jingle
> > > chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc
> > > +--- chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc.jingle
> > > 2010-10-04 05:42:27.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/autofill/form_structure.cc
> > > 2010-10-05 17:21:58.889230853 -0400
> > > +@@ -12,7 +12,7 @@
> > > + #include "chrome/browser/autofill/autofill_xml_parser.h"
> > > + #include "chrome/browser/autofill/field_types.h"
> > > + #include "chrome/browser/autofill/form_field.h"
> > > +-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
> > > ++#include <talk/xmllite/xmlelement.h>
> > > + #include "webkit/glue/form_field.h"
> > > +
> > > + using webkit_glue::FormData;
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.c
> > > c.jingle
> > >
> >
> chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.c
> > > c
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.c
> > > c.jingle 2010-10-04 05:42:35.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/browser/chromeos/login/google_authenticator.c
> > > c 2010-10-05 17:21:58.890230871 -0400
> > > +@@ -32,7 +32,7 @@
> > > + #include "net/base/load_flags.h"
> > > + #include "net/base/net_errors.h"
> > > + #include "net/url_request/url_request_status.h"
> > > +-#include "third_party/libjingle/source/talk/base/urlencode.h"
> > > ++#include <talk/base/urlencode.h>
> > > +
> > > + using base::Time;
> > > + using base::TimeDelta;
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet
> > > _handler.cc.jingle
> > >
> >
> chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet
> > > _handler.cc
> > > +---
> > >
> >
> chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet
> > > _handler.cc.jingle 2010-10-04 05:42:35.000000000 -0400
> > > ++++
> > >
> >
> chromium-7.0.542.0/chrome/browser/sync/notifier/cache_invalidation_packet
> > > _handler.cc 2010-10-05 17:21:58.891365245 -0400
> > > +@@ -65,7 +65,7 @@ class CacheInvalidationListenTask : publ
> > > + }
> > > + // Acknowledge receipt of the iq to the buzz server.
> > > + // TODO(akalin): Send an error response for malformed packets.
> > > +- scoped_ptr<buzz::XmlElement>
> > > response_stanza(MakeIqResult(stanza));
> > > ++ talk_base::jingle_scoped_ptr<buzz::XmlElement>
> > > response_stanza(MakeIqResult(stanza));
> > > + SendStanza(response_stanza.get());
> > > + return STATE_RESPONSE;
> > > + }
> > > +@@ -108,7 +108,7 @@ class CacheInvalidationListenTask : publ
> > > + return true;
> > > + }
> > > +
> > > +- scoped_ptr<Callback1<const std::string&>::Type> callback_;
> > > ++ talk_base::jingle_scoped_ptr<Callback1<const std::string&>::Type>
> > > callback_;
> > > + DISALLOW_COPY_AND_ASSIGN(CacheInvalidationListenTask);
> > > + };
> > > +
> > > +@@ -125,7 +125,7 @@ class CacheInvalidationSendMessageTask :
> > > + virtual ~CacheInvalidationSendMessageTask() {}
> > > +
> > > + virtual int ProcessStart() {
> > > +- scoped_ptr<buzz::XmlElement> stanza(
> > > ++ talk_base::jingle_scoped_ptr<buzz::XmlElement> stanza(
> > > + MakeCacheInvalidationIqPacket(to_jid_, task_id(), msg_,
> > > + seq_, sid_));
> > > + VLOG(1) << "Sending message: "
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp.jingle
> > > chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp
> > > +--- chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp.jingle
> > > 2010-10-04 05:42:35.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/sync/tools/sync_tools.gyp
> > > 2010-10-05 17:21:58.892363130 -0400
> > > +@@ -20,7 +20,7 @@
> > > + '<(DEPTH)/chrome/chrome.gyp:common_constants',
> > > + '<(DEPTH)/chrome/chrome.gyp:sync_notifier',
> > > + '<(DEPTH)/jingle/jingle.gyp:notifier',
> > > +- '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle',
> > > ++ '<(DEPTH)/build/linux/system.gyp:jingle',
> > > + ],
> > > + },
> > > + ],
> > > +diff -up chromium-7.0.542.0/chrome/chrome_browser.gypi.jingle
> > > chromium-7.0.542.0/chrome/chrome_browser.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_browser.gypi.jingle
> 2010-10-05
> > > 17:21:58.724488357 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_browser.gypi 2010-10-05
> > > 17:21:58.896371788 -0400
> > > +@@ -32,7 +32,7 @@
> > > + '../third_party/bzip2/bzip2.gyp:bzip2',
> > > + '../third_party/expat/expat.gyp:expat',
> > > (637 more lines skipped)
> > >
> > > ++++++ chromium-7.0.542.0-system-libvpx.patch (new)
> > > --- chromium-7.0.542.0-system-libvpx.patch
> > > +++ chromium-7.0.542.0-system-libvpx.patch
> > > +diff -up chromium-7.0.542.0/build/linux/system.gyp.system-libvpx
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.system-libvpx
> 2010-10-06
> > > 14:01:19.638507000 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-06
> > > 14:01:19.650507000 -0400
> > > +@@ -409,6 +409,26 @@
> > > + }]]
> > > + },
> > > + {
> > > ++ 'target_name': 'libvpx',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags libvpx)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other libvpx)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l libvpx)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > + 'target_name': 'gnome-keyring',
> > > + 'type': 'settings',
> > > + 'conditions': [
> > > +diff -up chromium-7.0.542.0/remoting/base/decoder_vp8.cc.system-libvpx
> > > chromium-7.0.542.0/remoting/base/decoder_vp8.cc
> > > +--- chromium-7.0.542.0/remoting/base/decoder_vp8.cc.system-libvpx
> > > 2010-10-04 05:39:55.000000000 -0400
> > > ++++ chromium-7.0.542.0/remoting/base/decoder_vp8.cc 2010-10-06
> > > 14:01:19.651507000 -0400
> > > +@@ -10,9 +10,9 @@
> > > +
> > > + extern "C" {
> > > + #define VPX_CODEC_DISABLE_COMPAT 1
> > > +-#include "third_party/libvpx/include/vpx/vpx_codec.h"
> > > +-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
> > > +-#include "third_party/libvpx/include/vpx/vp8dx.h"
> > > ++#include <vpx_codec.h>
> > > ++#include <vpx_decoder.h>
> > > ++#include <vp8dx.h>
> > > + }
> > > +
> > > + namespace remoting {
> > > +diff -up chromium-7.0.542.0/remoting/base/encoder_vp8.cc.system-libvpx
> > > chromium-7.0.542.0/remoting/base/encoder_vp8.cc
> > > +--- chromium-7.0.542.0/remoting/base/encoder_vp8.cc.system-libvpx
> > > 2010-10-04 05:39:56.000000000 -0400
> > > ++++ chromium-7.0.542.0/remoting/base/encoder_vp8.cc 2010-10-06
> > > 14:01:19.652507000 -0400
> > > +@@ -11,9 +11,9 @@
> > > +
> > > + extern "C" {
> > > + #define VPX_CODEC_DISABLE_COMPAT 1
> > > +-#include "third_party/libvpx/include/vpx/vpx_codec.h"
> > > +-#include "third_party/libvpx/include/vpx/vpx_encoder.h"
> > > +-#include "third_party/libvpx/include/vpx/vp8cx.h"
> > > ++#include <vpx_codec.h>
> > > ++#include <vpx_encoder.h>
> > > ++#include <vp8cx.h>
> > > + }
> > > +
> > > + namespace remoting {
> > > +diff -up chromium-7.0.542.0/remoting/remoting.gyp.system-libvpx
> > > chromium-7.0.542.0/remoting/remoting.gyp
> > > +--- chromium-7.0.542.0/remoting/remoting.gyp.system-libvpx
> > 2010-10-06
> > > 14:01:19.641507000 -0400
> > > ++++ chromium-7.0.542.0/remoting/remoting.gyp 2010-10-06
> > > 14:01:19.654507000 -0400
> > > +@@ -114,7 +114,7 @@
> > > + '../gfx/gfx.gyp:gfx',
> > > + '../media/media.gyp:media',
> > > + '../third_party/protobuf/protobuf.gyp:protobuf_lite',
> > > +- '../third_party/libvpx/libvpx.gyp:libvpx_include',
> > > ++ '../build/linux/system.gyp:libvpx',
> > > + '../third_party/zlib/zlib.gyp:zlib',
> > > + 'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
> > > + 'base/protocol/chromotocol.gyp:trace_proto_lib',
> > > +diff -up chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp.system-libvpx
> > > chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp
> > > +--- chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp.system-libvpx
> > > 2010-10-06 14:04:09.730507291 -0400
> > > ++++ chromium-7.0.542.0/third_party/ffmpeg/ffmpeg.gyp 2010-10-06
> > > 14:05:14.341510863 -0400
> > > +@@ -812,6 +812,9 @@
> > > + '<(output_root)',
> > > + '../..', # The chromium 'src' directory.
> > > + ],
> > > ++ 'dependencies': [
> > > ++ '../../build/linux/system.gyp:libvpx',
> > > ++ ],
> > > + 'direct_dependent_settings': {
> > > + 'defines': [
> > > + '__STDC_CONSTANT_MACROS', # FFmpeg uses
> > INT64_C.
> > > +diff -up
> > >
> >
> chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment.syst
> > > em-libvpx
> > > chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment
> > > +---
> > >
> >
> chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment.syst
> > > em-libvpx 2010-10-04 05:45:34.000000000 -0400
> > > ++++
> > chromium-7.0.542.0/third_party/ffmpeg/ffmpeg_stub_headers.fragment
> > > 2010-10-06 14:01:19.655507000 -0400
> > > +@@ -7,9 +7,9 @@ extern "C" {
> > > + #include <libavformat/avformat.h>
> > > +
> > > + #define VPX_CODEC_DISABLE_COMPAT 1
> > > +-#include "third_party/libvpx/include/vpx/vpx_codec.h"
> > > +-#include "third_party/libvpx/include/vpx/vpx_encoder.h"
> > > +-#include "third_party/libvpx/include/vpx/vpx_decoder.h"
> > > ++#include <vpx_codec.h>
> > > ++#include <vpx_encoder.h>
> > > ++#include <vpx_decoder.h>
> > > +
> > > + typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
> > > +
> > >
> > > ++++++ chromium-7.0.542.0-system-speex-static.patch (new)
> > > --- chromium-7.0.542.0-system-speex-static.patch
> > > +++ chromium-7.0.542.0-system-speex-static.patch
> > > +diff -up chromium-7.0.542.0/build/linux/system.gyp.speex
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.speex 2010-10-08
> > > 09:50:13.942342024 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-08
> > > 09:50:14.046342004 -0400
> > > +@@ -369,6 +369,26 @@
> > > + }]]
> > > + },
> > > + {
> > > ++ 'target_name': 'speex',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags speex)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l speex)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > + 'target_name': 'gnome-keyring',
> > > + 'type': 'settings',
> > > + 'conditions': [
> > > +diff -up
> > > chromium-7.0.542.0/chrome/browser/speech/speech_recognizer.cc.speex
> > > chromium-7.0.542.0/chrome/browser/speech/speech_recognizer.cc
> > > +---
> > chromium-7.0.542.0/chrome/browser/speech/speech_recognizer.cc.speex
> > > 2010-10-04 05:42:38.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/browser/speech/speech_recognizer.cc
> > > 2010-10-08 09:50:14.048342001 -0400
> > > +@@ -10,7 +10,7 @@
> > > + #include "chrome/browser/chrome_thread.h"
> > > + #include "chrome/browser/profile.h"
> > > + #include "chrome/common/net/url_request_context_getter.h"
> > > +-#include "third_party/speex/include/speex/speex.h"
> > > ++#include <speex/speex.h>
> > > +
> > > + using media::AudioInputController;
> > > + using std::list;
> > > +diff -up chromium-7.0.542.0/chrome/chrome_browser.gypi.speex
> > > chromium-7.0.542.0/chrome/chrome_browser.gypi
> > > +--- chromium-7.0.542.0/chrome/chrome_browser.gypi.speex
> 2010-10-08
> > > 09:50:13.000000000 -0400
> > > ++++ chromium-7.0.542.0/chrome/chrome_browser.gypi 2010-10-08
> > > 09:51:39.421341498 -0400
> > > +@@ -35,7 +35,7 @@
> > > + '../third_party/libxml/libxml.gyp:libxml',
> > > + '../third_party/npapi/npapi.gyp:npapi',
> > > + '../third_party/hunspell/hunspell.gyp:hunspell',
> > > +- '../third_party/speex/speex.gyp:libspeex',
> > > ++ '../build/linux/system.gyp:speex',
> > > + '../webkit/support/webkit_support.gyp:appcache',
> > > + '../webkit/support/webkit_support.gyp:blob',
> > > + '../webkit/support/webkit_support.gyp:database',
> > >
> > > ++++++ chromium-7.0.542.0-system-srtp.patch (new)
> > > --- chromium-7.0.542.0-system-srtp.patch
> > > +++ chromium-7.0.542.0-system-srtp.patch
> > > +diff -up chromium-7.0.542.0/build/linux/system.gyp.system-srtp
> > > chromium-7.0.542.0/build/linux/system.gyp
> > > +--- chromium-7.0.542.0/build/linux/system.gyp.system-srtp 2010-10-05
> > > 17:26:00.110229216 -0400
> > > ++++ chromium-7.0.542.0/build/linux/system.gyp 2010-10-05
> > > 17:26:00.149110175 -0400
> > > +@@ -389,6 +389,26 @@
> > > + }]]
> > > + },
> > > + {
> > > ++ 'target_name': 'libsrtp',
> > > ++ 'type': 'settings',
> > > ++ 'conditions': [
> > > ++ ['_toolset=="target"', {
> > > ++ 'direct_dependent_settings': {
> > > ++ 'cflags': [
> > > ++ '<!@(pkg-config --cflags libsrtp)',
> > > ++ ],
> > > ++ },
> > > ++ 'link_settings': {
> > > ++ 'ldflags': [
> > > ++ '<!@(pkg-config --libs-only-L --libs-only-other libsrtp)',
> > > ++ ],
> > > ++ 'libraries': [
> > > ++ '<!@(pkg-config --libs-only-l libsrtp)',
> > > ++ ],
> > > ++ },
> > > ++ }]]
> > > ++ },
> > > ++ {
> > > + 'target_name': 'gnome-keyring',
> > > + 'type': 'settings',
> > > + 'conditions': [
> > > +diff -up chromium-7.0.542.0/remoting/remoting.gyp.system-srtp
> > > chromium-7.0.542.0/remoting/remoting.gyp
> > > +--- chromium-7.0.542.0/remoting/remoting.gyp.system-srtp
> 2010-10-05
> > > 17:26:00.000000000 -0400
> > > ++++ chromium-7.0.542.0/remoting/remoting.gyp 2010-10-05
> > > 17:26:43.713123473 -0400
> > > +@@ -301,7 +301,7 @@
> > > + '../build/linux/system.gyp:jinglep2p',
> > > + '../build/linux/system.gyp:jinglesessionphone',
> > > + '../build/linux/system.gyp:jinglesessiontunnel',
> > > +- '../third_party/libsrtp/libsrtp.gyp:libsrtp',
> > > ++ '../build/linux/system.gyp:libsrtp',
> > > + ],
> > > + 'export_dependent_settings': [
> > > + '../build/linux/system.gyp:jingle',
> > >
> > > ++++++ chromium-6.0.486.0-20100805svn55059.tar.bz2 ->
> > > chromium-7.0.542.0.tar.bz2
> > > 8637040 lines of diff (skipped)
> > >
> > > ++++++ chromium-browser.desktop
> > > --- chromium-browser.desktop
> > > +++ chromium-browser.desktop
> > > @@ -3,12 +3,13 @@
> > > Name=Chromium Web Browser
> > > Comment=Browse the World Wide Web
> > > GenericName=Web Browser
> > > -Exec=chromium-browser --enable-plugins --enable-extensions
> > > --enable-user-scripts --enable-printing --enable-sync --auto-ssl-client-auth
> > > +Exec=chromium-browser --enable-plugins --enable-extensions
> > > --enable-user-scripts --enable-printing --enable-sync
> --auto-ssl-client-auth %U
> > > Terminal=false
> > > X-MultipleArgs=false
> > > Type=Application
> > > -Icon=chromium-browser.png
> > > +Icon=chromium-browser
> > > Categories=Network;WebBrowser;
> > > MimeType=text/html;
> > > StartupWMClass=Chromium
> > > +StartupNotify=true
> > >
> > >
> > > ++++++ chromium-daily-tarball.sh (new)
> > > --- chromium-daily-tarball.sh
> > > +++ chromium-daily-tarball.sh
> > > +#!/bin/bash
> > > +
> > > +# This script checks out chromium source from svn, using the gclient tool.
> > > +
> > > +LOCALDIR=`pwd`
> > > +REMOVE=false
> > > +TODAYSDATE=`date +%Y%m%d`
> > > +USAGE="Usage: chromium-daily-tarball.sh [-hrv]"
> > > +VERBOSE=false
> > > +CLEAN=false
> > > +BETA_CHANNEL=false
> > > +DEV_CHANNEL=false
> > > +CHANNEL_HACK=false
> > > +CHANNELS_URL=http://src.chromium.org/svn/releases/LATEST.txt
> > > +CHROMIUM_URL=http://src.chromium.org/svn/trunk/src
> > > +VERSION=
> > > +
> > > +while getopts "bcdhrv" opt; do
> > > + case $opt in
> > > + b ) BETA_CHANNEL=true
> > > + CHANNEL_HACK=true ;;
> > > + c ) CLEAN=true ;;
> > > + d ) DEV_CHANNEL=true
> > > + CHANNEL_HACK=true ;;
> > > + h ) printf "$USAGE\n"
> > > + printf "\nAvailable command line options:\n"
> > > + printf "%b\t-b\t\tuse beta channel source\n"
> > > + printf "%b\t-c\t\tmake tarball of clean source, nothing
> > > removed/altered\n"
> > > + printf "%b\t-d\t\tuse dev channel source\n"
> > > + printf "%b\t-h\t\tthis help\n"
> > > + printf "%b\t-r\t\tremove conflicting chromium
> > > files/directories\n"
> > > + printf "%b\t-v\t\tverbose output\n\n"
> > > + exit 1 ;;
> > > + r ) REMOVE=true ;;
> > > + v ) VERBOSE=true
> > > + printf "[VERBOSE]: Enabled\n" ;;
> > > + \? ) printf "$USAGE\n"
> > > + exit 1 ;;
> > > + esac
> > > +done
> > > +
> > > +# Prerequisites:
> > > +# gclient
> > > +printf "Looking for gclient in your PATH: "
> > > +which gclient
> > > +RETVAL=$?
> > > +if [ $RETVAL -ne 0 ]; then
> > > + printf "[ERROR]: Could not find gclient in PATH. Please install it first.\n"
> > > + exit 2
> > > +else
> > > + printf "Found it! Lets get to work.\n"
> > > +fi
> > > +
> > > +# First, lets look for the directory, without svnrev.
> > > +if [ -d chromium-$TODAYSDATE ]; then
> > > + if [ "$REMOVE" = "true" ]; then
> > > + if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Removing conflicting directory:
> > > chromium-$TODAYSDATE/\n"
> > > + fi
> > > + rm -rf chromium-$TODAYSDATE/
> > > + if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Removed conflicting directory:
> > > chromium-$TODAYSDATE/\n"
> > > + fi
> > > + else
> > > + printf "[ERROR]: chromium-$TODAYSDATE/ exists, use -r option to
> > > remove it\n"
> > > + exit 2
> > > + fi
> > > +fi
> > > +
> > > +# At this point, we know the chromium daily directory does not exist, time
> to
> > > make it.
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Creating directory: chromium-$TODAYSDATE/\n"
> > > +fi
> > > +mkdir -p chromium-$TODAYSDATE
> > > +
> > > +# go into the chromium dir
> > > +pushd chromium-$TODAYSDATE/
> > > +
> > > +if [ "$CHANNEL_HACK" = "true" ]; then
> > > + if [ "$BETA_CHANNEL" = "true" ]; then
> > > + VERSION=`wget -qO -
> > > http://src.chromium.org/svn/releases/LATEST.txt | grep -A3 "Beta
> Channel"
> > |
> > > grep Linux | cut -d ":" -f 2 | sed 's| ||g'`
> > > + else
> > > + if [ "$DEV_CHANNEL" = "true" ]; then
> > > + VERSION=`wget -qO -
> > > http://src.chromium.org/svn/releases/LATEST.txt | grep -A3 "Dev Channel"
> |
> > > grep Linux | cut -d ":" -f 2 | sed 's| ||g'`
> > > + else
> > > + printf "How did you get here? This computer stuff is hard.\n"
> > > + exit 1
> > > + fi
> > > + fi
> > > + CHROMIUM_URL=http://src.chromium.org/svn/releases/$VERSION
> > > + svnadmin create repo
> > > + svn co file://`pwd`/repo repo2
> > > + svn export $CHROMIUM_URL/DEPS repo2/DEPS
> > > + sed -i -e "s%'/%'http://src.chromium.org/svn/%" repo2/DEPS
> > > + svn add repo2/DEPS
> > > + svn commit -m '' repo2/DEPS
> > > +fi
> > > +
> > > +# Make the gclient config
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Generating gclient config\n"
> > > +fi
> > > +
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: gclient config $CHROMIUM_URL\n"
> > > +fi
> > > +gclient config $CHROMIUM_URL
> > > +
> > > +# We rewrite .gclient to take out the LayoutTests for size considerations
> > > +cat > .gclient <<'EOF'
> > > +# An element of this array (a "solution") describes a repository directory
> > > +# that will be checked out into your working copy. Each solution may
> > > +# optionally define additional dependencies (via its DEPS file) to be
> > > +# checked out alongside the solution's directory. A solution may also
> > > +# specify custom dependencies (via the "custom_deps" property) that
> > > +# override or augment the dependencies specified by the DEPS file.
> > > +# If a "safesync_url" is specified, it is assumed to reference the location of
> > > +# a text file which contains nothing but the last known good SCM revision
> to
> > > +# sync against. It is fetched if specified and used unless --head is passed
> > > +solutions = [
> > > + { "name" : "src",
> > > + "url" : "http://src.chromium.org/svn/trunk/src",
> > > + "custom_deps" : {
> > > + # To use the trunk of a component instead of what's in DEPS:
> > > + #"component": "https://svnserver/component/trunk/",
> > > + # To exclude a component from your working copy:
> > > + #"data/really_large_component": None,
> > > + "src/webkit/data/layout_tests/LayoutTests": None,
> > > + "src/third_party/WebKit/LayoutTests/": None,
> > > + },
> > > + "safesync_url": ""
> > > + }
> > > +]
> > > +EOF
> > > +
> > > +if [ "$CHANNEL_HACK" = "true" ]; then
> > > + sed -i
> > > 's|http://src.chromium.org/svn/trunk/src|file://'`pwd`'/repo|' .gclient
> > > + sed -i 's|"src",|"fake",|' .gclient
> > > +fi
> > > +
> > > +printf "Checking out the source tree. This will take some time.\n"
> > > +
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + # gclient sync --force
> > > + printf "gclient update\n"
> > > + gclient update
> > > +else
> > > + gclient update &>/dev/null
> > > + # gclient sync --force &>/dev/null
> > > +fi
> > > +
> > > +if [ "$CHANNEL_HACK" = "true" ]; then
> > > + # cleanup
> > > + rm -rf repo repo2
> > > +fi
> > > +
> > > +# Determine SVN rev and Version of chromium (we don't care about the
> > other
> > > sub-checkouts)
> > > +pushd src/chrome
> > > +SVNREV=`svnversion`
> > > +CHROME_VERSION=`cat VERSION | cut -f2 -d= |while read i; do echo -n
> $i\. ;
> > > done | cut -f1-4 -d.`
> > > +popd
> > > +
> > > +printf "Chromium ($CHROME_VERSION) svn$SVNREV [$TODAYSDATE]
> > > checked out\n"
> > > +
> > > +FULLVER=`echo ${CHROME_VERSION}-${TODAYSDATE}svn${SVNREV}`
> > > +
> > > +# Get rid of courgette.
> > > +rm -rf src/courgette
> > > +
> > > +if [ "$CLEAN" = "true" ]; then
> > > + printf "[CLEAN] Not removing unused bits\n"
> > > +else
> > > +
> > > +# Remove unused bits
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Removing unused bits\n"
> > > +fi
> > > +
> > > +rm -rf src/o3d/
> > > +rm -rf src/third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/
> > > +rm -rf src/webkit/data/layout_tests/
> > > +rm -rf src/third_party/hunspell/dictionaries/
> > > +rm -rf src/chrome/test/data/
> > > +rm -rf src/native_client/tests/
> > > +rm -rf src/third_party/WebKit/LayoutTests/
> > > +
> > > +fi
> > > +
> > > +if [ "$CLEAN" = "true" ]; then
> > > + printf "[CLEAN] Not removing unnecessary third_party bits\n"
> > > +else
> > > +
> > > +# Remove third party bits that we have on the system
> > > +if [ "$VERBOSE" = "true" ]; then
> > > + printf "[VERBOSE]: Removing unnecessary third_party bits\n"
> > > +fi
> > > +
> > > +rm -rf src/v8/include src/v8/src/
> > > (122 more lines skipped)
> > >
> > > ++++++ chromium-latest.py (new)
> > > --- chromium-latest.py
> > > +++ chromium-latest.py
> > > +#!/usr/bin/python
> > > +
> > > +import glob
> > > +import os
> > > +import re
> > > +import shutil
> > > +import sys
> > > +import tarfile
> > > +import urllib
> > > +from sgmllib import SGMLParser
> > > +
> > > +class URLLister(SGMLParser):
> > > + def reset(self):
> > > + SGMLParser.reset(self)
> > > + self.urls = []
> > > + def start_a(self, attrs):
> > > + href = [v for k, v in attrs if k=='href']
> > > + if href:
> > > + self.urls.extend(href)
> > > +
> > > +def dlProgress(count, blockSize, totalSize):
> > > + percent = int(count*blockSize*100/totalSize)
> > > + sys.stdout.write("\r" + "Downloading %s ... %d%%" % (latest,
> percent))
> > > + sys.stdout.flush()
> > > +
> > > +def delete_chromium_dir(dir):
> > > + full_dir = "%s/%s" % (latest_dir, dir)
> > > + print 'Deleting ' + full_dir + ' ',
> > > + if os.path.isdir(full_dir):
> > > + shutil.rmtree(full_dir)
> > > + print '[DONE]'
> > > + else:
> > > + print '[NOT FOUND]'
> > > +
> > > +def delete_chromium_files(files):
> > > + full_path = "%s/%s" % (latest_dir, files)
> > > + print 'Deleting ' + full_path + ' ',
> > > + for filename in glob.glob(full_path):
> > > + print 'Deleting ' + filename + ' ',
> > > + os.remove(filename)
> > > + print '[DONE]'
> > > +
> > > +chromium_url = "http://build.chromium.org/buildbot/official/"
> > > +chromium_root_dir = "/home/spot/chromium"
> > > +
> > > +usock = urllib.urlopen(chromium_url)
> > > +parser = URLLister()
> > > +parser.feed(usock.read())
> > > +usock.close()
> > > +
> > > +# sort the list of urls we got
> > > +parser.urls.sort()
> > > +
> > > +# get the last item in the list
> > > +# this should always be the newest build
> > > +latest = parser.urls.pop()
> > > +
> > > +chromium_version = re.sub('chromium-', '', latest)
> > > +chromium_version = re.sub('.tar.bz2', '', chromium_version)
> > > +
> > > +print "Latest Chromium Version found at %s is %s" % (chromium_url,
> > > chromium_version)
> > > +
> > > +latest_tarball_url = "%s%s" % (chromium_url, latest)
> > > +latest_dir = "%s/chromium-%s" % (chromium_root_dir,
> chromium_version)
> > > +
> > > +# Let's make sure we haven't already downloaded it.
> > > +if os.path.isfile("./%s" % latest):
> > > + print "%s already exists!" % latest
> > > +else:
> > > + # Perhaps look at using python-progressbar at some point?
> > > + urllib.urlretrieve(latest_tarball_url, latest, reporthook=dlProgress)
> > > + urllib.urlcleanup()
> > > + print ""
> > > +
> > > +# Lets make sure we haven't unpacked it already
> > > +if os.path.isdir(latest_dir):
> > > + print "%s already exists, perhaps %s has already been unpacked?" %
> > > (latest_dir, latest)
> > > +else:
> > > + # Okay, now we need to open that puppy up.
> > > + print "Unpacking %s into %s, please wait." % (latest, latest_dir)
> > > + tar = tarfile.open(latest, "r:bz2")
> > > + tar.extractall(path=chromium_root_dir)
> > > + tar.close
> > > +
> > > +junk_dirs = ['courgette', 'o3d',
> > > +
> 'third_party/WebKit/WebKitTools/Scripts/webkitpy/layout_tests',
> > > + 'webkit/data/layout_tests',
> > > 'third_party/hunspell/dictionaries',
> > > + 'chrome/test/data', 'native_client/tests',
> > > + 'third_party/WebKit/LayoutTests', 'v8/include', 'v8/src',
> > > + 'third_party/nss', 'third_party/nspr', 'third_party/icu',
> > > + 'third_party/expat/files',
> > > + 'third_party/ffmpeg/binaries',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/doc',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/ffpresets',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/mt-work',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/tools',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/tests',
> > > + 'third_party/zlib/contrib',
> > > + 'third_party/libjingle/',
> > > + 'third_party/libevent/compat', 'third_party/libevent/linux',
> > > + 'third_party/libevent/mac', 'third_party/libevent/sample',
> > > + 'third_party/libevent/test', 'third_party/libxml/build',
> > > + 'third_party/libxml/include', 'third_party/libxml/linux',
> > > + 'third_party/libxml/mac', 'third_party/libxml/win32',
> > > + 'third_party/libxslt/build', 'third_party/libxslt/libexslt',
> > > + 'third_party/libxslt/libxslt', 'third_party/libxslt/linux',
> > > + 'third_party/libxslt/mac', 'third_party/libxslt/win32',
> > > +
> > > 'third_party/WebKit/WebCore/platform/image-decoders/zlib/']
> > > +
> > > +junk_files = ['third_party/bzip2/*.c', 'third_party/bzip2/*.h',
> > > 'third_party/bzip2/LICENSE',
> > > + 'third_party/libjpeg/*.c', 'third_party/libjpeg/README*',
> > > + 'third_party/libpng/*.c', 'third_party/libpng/*.h',
> > > 'third_party/libpng/README*', 'third_party/libpng/LICENSE',
> > > + 'third_party/zlib/*.c', 'third_party/zlib/*.h',
> > > 'third_party/zlib/README*',
> > > + 'third_party/libevent/*.c', 'third_party/libevent/*.h',
> > > 'third_party/libevent/*sh', 'third_party/libevent/config*'
> > > + 'third_party/libevent/*.3',
> 'third_party/libevent/README',
> > > 'third_party/libevent/ChangeLog',
> > > + 'third_party/libevent/Makefile.*',
> > > 'third_party/libevent/aclocal.m4', 'third_party/libevent/*.py',
> > > + 'third_party/libevent/missing',
> > > 'third_party/libevent/mkinstalldirs',
> > > + 'third_party/libxml/*.c', 'third_party/libxml/*.h',
> > > 'third_party/libxml/*.in',
> > > + 'third_party/libxml/*.m4', 'third_party/libxml/*.py',
> > > 'third_party/libxml/*.xml',
> > > + 'third_party/libxml/missing',
> > > 'third_party/libxml/mkinstalldirs', 'third_party/libxml/*.1',
> > > + 'third_party/libxml/AUTHORS',
> > 'third_party/libxml/COPYING',
> > > 'third_party/libxml/ChangeLog',
> > > + 'third_party/libxml/Copyright',
> > 'third_party/libxml/INSTALL',
> > > 'third_party/libxml/NEWS',
> > > + 'third_party/libxml/README',
> > > 'third_party/libxml/README.tests', 'third_party/libxml/TODO*',
> > > + 'third_party/libxml/config*', 'third_party/libxml/*.pl',
> > > + 'third_party/libxslt/AUTHORS',
> > 'third_party/libxslt/COPYING',
> > > 'third_party/libxslt/ChangeLog',
> > > + 'third_party/libxslt/FEATURES',
> > 'third_party/libxslt/INSTALL',
> > > 'third_party/libxslt/NEWS',
> > > + 'third_party/libxslt/README', 'third_party/libxslt/TODO',
> > > 'third_party/libxslt/*.h',
> > > + 'third_party/libxslt/*.m4', 'third_party/libxslt/compile',
> > > 'third_party/libxslt/config*',
> > > + 'third_party/libxslt/depcomp', 'third_party/libxslt/*sh',
> > > 'third_party/libxslt/*.in',
> > > + 'third_party/libxslt/*.spec', 'third_party/libxslt/missing',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/*.c',
> > > 'third_party/ffmpeg/patched-ffmpeg-mt/*.h',
> > > +
> 'third_party/ffmpeg/patched-ffmpeg-mt/libavformat/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libavcodec/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libavutil/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libavfilter/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libavdevice/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libpostproc/*.c',
> > > + 'third_party/ffmpeg/patched-ffmpeg-mt/libswscale/*.c']
> > > +
> > > +# Okay, now we clean out the junk.
> > > +
> > > +# First, the dirs:
> > > +for dir in junk_dirs:
> > > + delete_chromium_dir(dir)
> > > +
> > > +# Then, the files:
> > > +for file in junk_files:
> > > + delete_chromium_files(file)
> > > +
> > > +# There has got to be a better, more portable way to do this.
> > > +os.system("find %s -depth -name reference_build -type d -exec rm -rf {}
> \;" %
> > > latest_dir)
> > > +
> > > +# I could not find good bindings for xz/lzma support, so we system call here
> > > too.
> > > +
> > > +chromium_clean_xz_file = "chromium-" + chromium_version +
> > > "-clean.tar.lzma"
> > > +
> > > +if os.path.isfile("%s/%s" % (chromium_root_dir, chromium_clean_xz_file)):
> > > + print "%s already exists!" % chromium_clean_xz_file
> > > +else:
> > > + print "Compressing cleaned tree, please wait..."
> > > + os.chdir(chromium_root_dir)
> > > + os.system("tar --exclude=\.svn -cf - chromium-%s | xz -9 -F
> lzma > %s" %
> > > (chromium_version, chromium_clean_xz_file))
> > > + print "done!"
> > >
> > > ++++++ ffmpeg-0.6-headers.tar.bz2 (new)
> > >
> > > ++++++ gcc-4.5.0--noinline-noclone.patch (new)
> > > --- gcc-4.5.0--noinline-noclone.patch
> > > +++ gcc-4.5.0--noinline-noclone.patch
> > > +diff -up b/ipc/ipc_message_utils.h a/ipc/ipc_message_utils.h
> > > +--- b/ipc/ipc_message_utils.h 2010-10-11 17:27:49.976222357 +0800
> > > ++++ a/ipc/ipc_message_utils.h 2010-10-08 13:54:24.000000000 +0800
> > > +@@ -1125,7 +1125,10 @@ class MessageWithReply : public SyncMess
> > > +
> > > + MessageWithReply(int32 routing_id, uint32 type,
> > > + const RefSendParam& send, const ReplyParam&
> > > reply);
> > > +- static bool ReadSendParam(const Message* msg, SendParam* p)
> > > IPC_MSG_NOINLINE;
> > > ++ static bool ReadSendParam(const Message* msg, SendParam* p){
> > > ++ void* iter = SyncMessage::GetDataIterator(msg);
> > > ++ return ReadParam(msg, &iter, p);
> > > ++ }
> > > + static bool ReadReplyParam(
> > > + const Message* msg,
> > > + typename TupleTypes<ReplyParam>::ValueTuple* p)
> > > IPC_MSG_NOINLINE;
> > > +diff -up b/ipc/ipc_message_utils_impl.h a/ipc/ipc_message_utils_impl.h
> > > +--- b/ipc/ipc_message_utils_impl.h 2010-10-11 17:27:50.108220907 +0800
> > > ++++ a/ipc/ipc_message_utils_impl.h 2010-10-11 17:26:14.992221879
> +0800
> > > +@@ -42,13 +42,6 @@ MessageWithReply<SendParamType, ReplyPar
> > > + }
> > > +
> > > + template <class SendParamType, class ReplyParamType>
> > > +-bool MessageWithReply<SendParamType,
> > > ReplyParamType>::ReadSendParam(
> > > +- const Message* msg, SendParam* p) {
> > > +- void* iter = SyncMessage::GetDataIterator(msg);
> > > +- return ReadParam(msg, &iter, p);
> > > +-}
> > > +-
> > > +-template <class SendParamType, class ReplyParamType>
> > > + bool MessageWithReply<SendParamType,
> > > ReplyParamType>::ReadReplyParam(
> > > + const Message* msg, typename
> > TupleTypes<ReplyParam>::ValueTuple*
> > > p) {
> > > + void* iter = SyncMessage::GetDataIterator(msg);
> > >
> > > ++++++ libvpx.patch (new)
> > > --- libvpx.patch
> > > +++ libvpx.patch
> > > +diff -rup a/remoting/remoting.gyp b/remoting/remoting.gyp
> > > +--- a/remoting/remoting.gyp 2010-10-13 15:57:52.252221409 +0800
> > > ++++ b/remoting/remoting.gyp 2010-10-13 15:24:41.924220684 +0800
> > > +@@ -115,6 +115,7 @@
> > > + '../media/media.gyp:media',
> > > + '../third_party/protobuf/protobuf.gyp:protobuf_lite',
> > > + '../third_party/libvpx/libvpx.gyp:libvpx_include',
> > > ++ '../third_party/libvpx/libvpx.gyp:libvpx_lib',
> > > + '../third_party/zlib/zlib.gyp:zlib',
> > > + 'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
> > > + 'base/protocol/chromotocol.gyp:trace_proto_lib',
> > >
> > > ++++++ tcmalloc-fix.patch
> > > --- tcmalloc-fix.patch
> > > +++ tcmalloc-fix.patch
> > > @@ -1,6 +1,6 @@
> > > diff -Nur
> > >
> >
> chromium-6.0.417.0-20100526svn48276/third_party/tcmalloc/chromium/src/c
> > > entral_freelist.cc
> > >
> >
> chromium-6.0.417.0-20100526svn48276-fix/third_party/tcmalloc/chromium/sr
> > > c/central_freelist.cc
> > > ----
> > >
> >
> chromium-6.0.417.0-20100526svn48276/third_party/tcmalloc/chromium/src/c
> > > entral_freelist.cc 2010-05-26 23:54:14.000000000 +0800
> > > -+++
> > >
> >
> chromium-6.0.417.0-20100526svn48276-fix/third_party/tcmalloc/chromium/sr
> > > c/central_freelist.cc 2010-07-28 13:09:52.402573823 +0800
> > > +---
> > >
> >
> chromium-6.0.417.0-20100526svn48276/third_party/tcmalloc/chromium/src/c
> > > entral_freelist.cc 2010-05-26 23:54:14.000000000 +0800
> > > ++++
> > >
> >
> chromium-6.0.417.0-20100526svn48276-fix/third_party/tcmalloc/chromium/sr
> > > c/central_freelist.cc 2010-07-28 13:09:52.402573823 +0800
> > > @@ -57,9 +57,15 @@
> > > }
> > > }
> > > @@ -14,7 +14,6 @@
> > > +}
> > > +
> > > + void CentralFreeList::ReleaseToSpans(void* object) {
> > > -+ Span* span = MapObjectToSpan(object);
> > > ++ Span* span = MapObjectToSpan(object);
> > > ASSERT(span != NULL);
> > > ASSERT(span->refcount > 0);
> > > -
> > >
> > > ++++++ webkit-complex-font-selection-fix.patch
> > > --- webkit-complex-font-selection-fix.patch
> > > +++ webkit-complex-font-selection-fix.patch
> > > @@ -1,7 +1,7 @@
> > > -diff --git a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
> > > b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
> > > +diff --git
> > >
> >
> a/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.
> > > cpp
> > >
> >
> b/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.
> > > cpp
> > > index 53f4a52..004b38e 100644
> > > ---- a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
> > > -+++ b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
> > > +---
> > >
> >
> a/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.
> > > cpp
> > > ++++
> > >
> >
> b/third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux.
> > > cpp
> > > @@ -54,16 +54,44 @@ void FontCache::platformInit()
> > > {
> > > }
> > >
> > > ++++++ deleted files:
> > > --- chromium-20100218-webcore-hidden.patch
> > > --- chromium-20100315-explicit-export-webcore-symbols.patch
> > > --- chromium-20100315-hidden-option.patch
> > > --- chromium-20100315-system-zlib.patch
> > > --- chromium-20100408-ffmpeg-no-pkgconfig.patch
> > > --- chromium-20100408-system-expat.patch
> > > --- chromium-20100413-fix-yuv_row_posix-shared.patch
> > > --- chromium-20100415-flash-plugin-crash-fix.patch
> > > --- chromium-6.0.412.0-media-probe.patch
> > > --- chromium-6.0.425.0-ffmpegfix.patch
> > > --- chromium-6.0.425.0-system-expat.patch
> > > --- chromium-6.0.476.0-sharedlibfixes.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
> > > --- chromium-fix-gcc-4.5-build-errors.patch
> > > --- chromium-importer-crash-fix.patch
> > >
> > > _______________________________________________
> > > Meego-commits mailing list
> > > Meego-commits at meego.com
> > > http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-packaging
mailing list