+++ /dev/null
-diff -up chromium-20090909svn25824/src/webkit/glue/plugins/plugin_list_linux.cc.BAD chromium-20090909svn25824/src/webkit/glue/plugins/plugin_list_linux.cc
---- chromium-20090909svn25824/src/webkit/glue/plugins/plugin_list_linux.cc.BAD 2009-09-09 21:16:07.000000000 -0400
-+++ chromium-20090909svn25824/src/webkit/glue/plugins/plugin_list_linux.cc 2009-09-09 21:17:05.000000000 -0400
-@@ -86,9 +86,16 @@ void PluginList::GetPluginDirectories(st
-
- // 3) NS_SYSTEM_PLUGINS_DIR:
- // This varies across different versions of Firefox, so check 'em all.
-+ // TODO: add additional supported 64-bit architectures here
-+ #if defined(_x86_64_)
-+ plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
-+ plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
-+ plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
-+ #else
- plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins"));
- plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins"));
- plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins"));
-+ #endif
- }
-
- void PluginList::LoadPluginsFromDir(const FilePath& path,
#
# Conditional build:
+%bcond_with verbose # verbose build (V=1)
%bcond_with selinux # with SELinux (need policy first)
+%bcond_with system_v8 # with system v8
+%bcond_without system_zlib # with system zlib
+%bcond_with system_sqlite # with system sqlite
+%bcond_with system_ffmpeg # with system ffmpeg_mt
+%bcond_without sandboxing # with sandboxing
+%bcond_with shared_libs # with shared libs
# TODO
-# - optflags and strip (-debuginfo is quite empty)
-# - use tarballs from http://build.chromium.org/buildbot/tarball/
+# - check system sqlite linking problems
# NOTES:
-# - build - bp: ~1.3G GB bc: ~1.5 GB
-# - keep eye on spec from http://spot.fedorapeople.org/chromium/
+# - use nosource until the package is ready to be stbr, no point poisioning distfiles
+# - build i686: -bp: ~570MB; bc: ~928MB; -bb: ~1.0GB
+# - build x86_64: -bp: ~570MB; bc: ~990MB; -bb: ~1.0GB
+# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
+# - lynx -dump http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/ | grep orig.tar.gz
+
+%define svndate 20100202
+%define svnver 37790
+%define rel 0.16
-%define svndate 20090916
-%define svnver svn26424
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 4.0.212.0
-Release: 0.1.%{svndate}%{svnver}%{?dist}
+Version: 5.0.313.0
+Release: 0.%{svnver}.%{rel}
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
Patch0: system-libs.patch
-Patch1: system-libs-gyp.patch
+Patch1: plugin-searchdirs.patch
Patch2: gyp-system-minizip.patch
-Patch3: noffmpeg.patch
Patch5: options-support.patch
-Patch6: 64bit-plugin-path.patch
-Patch7: gyp-system-icu.patch
-Patch8: icu-code-changes.patch
-Patch9: no-sqlite-debug.patch
-Patch10: debug_util_posix-fix.patch
Patch11: memory_details-iceweasel.patch
-Source0: chromium-%{svndate}%{svnver}.tar.bz2
-# Source0-md5: 20663b974249b35d7ab655ce21b8f868
-# 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
-# Source1-md5: 1f821101d5a6f26345dc22ae5e0cbe1e
+Patch12: libpng14.patch
+Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
+# NoSource0-md5: 49d2d8f289facc215566a4f1aec37cb9
+NoSource: 0
Source2: %{name}.sh
Source3: %{name}.desktop
Source4: find-lang.sh
-# We don't actually use this in the build, but it is included so you can make the tarball.
-Source5: chromium-daily-tarball.sh
+URL: http://code.google.com/chromium/
BuildRequires: GConf2-devel
+BuildRequires: OpenGL
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
BuildRequires: atk-devel
BuildRequires: bison
BuildRequires: bzip2-devel
BuildRequires: dbus-devel
-BuildRequires: desktop-file-utils
BuildRequires: flex
BuildRequires: fontconfig-devel
+BuildRequires: glib2-devel
BuildRequires: gperf
BuildRequires: gtk+2-devel
+BuildRequires: hunspell-devel
BuildRequires: libevent-devel
BuildRequires: libicu-devel >= 4.2.1-2
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libstdc++-devel
+BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
+BuildRequires: lsb-release
+BuildRequires: lzma
+BuildRequires: lzma-devel
BuildRequires: minizip-devel
BuildRequires: nspr-devel
-BuildRequires: nss-devel
-BuildRequires: scons
+BuildRequires: nss-devel >= 1:3.12.3
+BuildRequires: pango-devel
+BuildRequires: patchutils >= 0.2.25
+BuildRequires: pkg-config
+BuildRequires: python
+BuildRequires: python-gyp >= 0.1-0.770
+BuildRequires: rpmbuild(macros) >= 1.453
+BuildRequires: sqlite3-devel >= 3.6.1
BuildRequires: v8-devel
+BuildRequires: xorg-lib-libXScrnSaver-devel
+%{?with_system_zlib:BuildRequires: zlib-devel}
Requires: browser-plugins >= 2.0
Provides: wwwbrowser
ExclusiveArch: %{ix86} %{x8664} arm
%define find_lang sh find-lang.sh %{buildroot}
-%define _enable_debug_packages 0
-%define no_install_post_strip 1
-
%description
Chromium is an open-source web browser, powered by WebKit.
-%prep
-%setup -q -n chromium-%{svndate}%{svnver} -a 1
+%package inspector
+Summary: Page inspector for the chromium-browser
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
-sed -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
+%description inspector
+Chromium is an open-source browser project that aims to build a safer,
+faster, and more stable way for all Internet users to experience the
+web.
+
+This package contains 'inspector', allowing web developpers to inspect
+any element of a web page at runtime (html, javascript, css, ..)
+
+%package l10n
+Summary: chromium-browser language packages
+Group: I18n
+Requires: %{name} = %{version}-%{release}
+
+%description l10n
+Chromium is an open-source browser project that aims to build a safer,
+faster, and more stable way for all Internet users to experience the
+web.
+
+This package contains language packages for 50 languages:
+
+ar, bg, bn, ca, cs, da, de, el, en-GB, es-419, es, et, fi, fil, fr,
+gu, he, hi, hr, hu, id, it, ja, kn, ko, lt, lv, ml, mr, nb, nl, or,
+pl, pt-BR, pt-PT, ro, ru, sk, sl, sr, sv, ta, te, th, tr, uk, vi,
+zh-CN, zh-TW
+
+%prep
+%setup -q -n %{name}-%{version}~svn%{svndate}r%{svnver}
+lzma -dc %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma | tar x
+rm -f %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma
# 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
exit 1
fi
+# Populate the LASTCHANGE file template as we no longer have the VCS files at this point
+echo "%{svnver}" > src/build/LASTCHANGE.in
+
+sed -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
%patch11 -p1
-
-# Scrape out incorrect optflags and hack in the correct ones
-find -name '*\.scons' | xargs %{__sed} -i -e "
- s|'-march=pentium4',||g
- s|'-msse2',||g
- s|'-mfpmath=sse',||g
- s|'-m32',||g
- s|'-O0',|'%{rpmcxxflags}'.split(' ')|g
-"
+%patch12 -p1
%build
-cd src/build
-
-# Regenerate the scons files
-# Also, set the sandbox paths correctly.
-./gyp_chromium all.gyp \
- -D linux_sandbox_path=%{_libdir}/%{name}/chromium-sandbox \
- -D linux_sandbox_chrome_path=%{_libdir}/%{name}/chromium-browser \
-%ifarch x86_64
+cd src
+%{__python} build/gyp_chromium --format=make build/all.gyp \
+%ifarch %{ix86}
+ -Dtarget_arch=ia32 \
+%endif
+%ifarch %{x8664}
-Dtarget_arch=x64 \
%endif
- -Duse_system_libpng=1 \
+%if "%{cc_version}" >= "4.4.0"
+ -Dno_strict_aliasing=1 -Dgcc_version=44 \
+%endif
+%if %{with sandboxing}
+ -Dlinux_sandbox_path=%{_libdir}/%{name}/chromium-sandbox \
+ -Dlinux_sandbox_chrome_path=%{_libdir}/%{name}/%{name} \
+%endif
+ %{!?debug:-Dwerror=} \
+ %{?with_shared_libs:-Dlibrary=shared_library} \
+ -Djavascript_engine=%{?with_system_v8:system-v8}%{!?with_system_v8:v8} \
-Duse_system_bzip2=1 \
+ -Duse_system_ffmpeg=%{?with_system_ffmpeg:1}%{!?with_system_ffmpeg:0} \
+ -Duse_system_libevent=1 \
-Duse_system_libjpeg=1 \
- -Duse_system_zlib=1 \
+ -Duse_system_libpng=1 \
+ -Duse_system_libxml=1 \
+ -Duse_system_libxslt=1 \
+ -Duse_system_sqlite=%{?with_system_sqlite:1}%{!?with_system_sqlite:0} \
+ -Duse_system_zlib=%{?with_system_zlib:1}%{!?with_system_zlib:0} \
+%if %{with arch}
+-Duse_system_yasm=1 \
+ -Dffmpeg_branding=Chrome \
+%endif
%if %{with selinux}
-Dselinux=1 \
%endif
- -Djavascript_engine=v8
-LDFLAGS="${LDFLAGS:-%rpmldflags}" \
-CFLAGS="${CFLAGS:-%rpmcflags}" \
-CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
-CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
-%{?__cc:CC="%{__cc}"} \
-%if %{with selinux}
- ../../depot_tools/hammer --mode=Release chrome
-%else
- ../../depot_tools/hammer --mode=Release chrome chrome_sandbox
-%endif
+%{__make} chrome %{?with_sandboxing:chrome_sandbox} \
+ BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
+ %{?with_verbose:V=1} \
+ CC="%{__cc}" \
+ CXX="%{__cxx}" \
+ CC.host="%{__cc}" \
+ CXX.host="%{__cxx}" \
+ CFLAGS="%{rpmcflags}" \
+ CXXFLAGS="%{rpmcxxflags}"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/{themes,locales,plugins,extensions,resources},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
-cd src/sconsbuild/Release
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
-%if "%{_lib}" != "lib"
-%{__sed} -i -e 's,/usr/lib,%{_libdir},' $RPM_BUILD_ROOT%{_bindir}/chromium-browser
-%endif
-cp -a chrome.pak locales resources themes $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a chromium-browser.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
-install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-browser
+cd src/out/%{!?debug:Release}%{?debug:Debug}
+
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__sed} -i -e 's,@libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp -a chrome.pak $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a locales/*.pak $RPM_BUILD_ROOT%{_libdir}/%{name}/locales
+cp -a resources/* $RPM_BUILD_ROOT%{_libdir}/%{name}/resources
+find $RPM_BUILD_ROOT%{_libdir}/%{name}/resources -name '*.d' | xargs rm
+cp -a chrome.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+cp -a product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install -p chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-sandbox
+install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p xdg-settings $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
cd -
-desktop-file-install --dir $RPM_BUILD_ROOT%{_desktopdir} %{SOURCE3}
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
# find locales
%find_lang %{name}.lang
+%{__sed} -i -e '/en-US.pak/d' %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_browser_plugins
+
+%postun
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
+fi
+
%files -f %{name}.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/chromium-browser
-%{_mandir}/man1/chromium-browser.1*
-%{_pixmapsdir}/chromium-browser.png
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_pixmapsdir}/%{name}.png
%{_desktopdir}/*.desktop
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/chrome.pak
%dir %{_libdir}/%{name}/locales
-%{_libdir}/%{name}/resources
-%{_libdir}/%{name}/themes
-%attr(755,root,root) %{_libdir}/%{name}/chromium-browser
+%{_libdir}/%{name}/locales/en-US.pak
+%dir %{_libdir}/%{name}/resources
+%dir %{_libdir}/%{name}/themes
+%dir %{_libdir}/%{name}/extensions
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/%{name}
# These unique permissions are intentional and necessary for the sandboxing
%attr(4555,root,root) %{_libdir}/%{name}/chromium-sandbox
+
+# ffmpeg libs
+%attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
+
+# bundle this copy until xdg-utils will have this itself
+%attr(755,root,root) %{_libdir}/%{name}/xdg-settings
+
+%files inspector
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/resources/inspector
+
+%files l10n -f %{name}.lang
+%defattr(644,root,root,755)
+++ /dev/null
-#!/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
-
-
-while getopts "chrv" opt; do
- case $opt in
- c ) CLEAN=true ;;
- h ) printf "$USAGE\n"
- printf "\nAvailable command line options:\n"
- printf "%b\t-c\t\tmake tarball of clean source, nothing removed/altered\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/
-
-# Make the gclient config
-if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Generating gclient config\n"
-fi
-
-gclient config http://src.chromium.org/svn/trunk/src
-
-# 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,
- },
- "safesync_url": ""
- }
-]
-EOF
-
-printf "Checking out the source tree. This will take some time.\n"
-
-if [ "$VERBOSE" = "true" ]; then
- gclient sync --force
-else
- gclient sync --force 2>&1 >/dev/null
-fi
-
-# Determine SVN rev of chromium (we don't care about the other sub-checkouts)
-pushd src/chrome
-SVNREV=`svnversion`
-popd
-
-printf "Chromium svn$SVNREV [$TODAYSDATE] checked out\n"
-
-FULLVER=`echo ${TODAYSDATE}svn${SVNREV}`
-
-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
-pushd src/third_party
-
-# First, just take out the sources for the items which have already been conditionalized so we're sure we're not using them.
-# We need to leave the .gyp files since this is how it finds the system libs.
-rm -rf bzip2/*.c bzip2/*.h bzip2/LICENSE libjpeg/*.c libjpeg/README* libpng/*.c libpng/*.h libpng/README* libpng/LICENSE zlib/*.c zlib/*.h zlib/contrib/ zlib/README*
-
-# Next, nuke the whole directories for things not yet conditionalized:
-rm -rf libevent/ libxml/ libxslt/ nss/ nspr/ icu/
-
-# Lastly, get rid of the ffmpeg binaries
-rm -rf ffmpeg/binaries
-popd
-
-# Get rid of .svn bits to save space
-if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removing unnecessary .svn bits\n"
-fi
-find src -depth -name .svn -type d -exec rm -rf {} \;
-
-# Get rid of reference_build prebuilt binaries
-if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removing reference_build prebuilt binaries\n"
-fi
-find src -depth -name reference_build -type d -exec rm -rf {} \;
-
-# Clean
-fi
-
-# Gclient embeds the full checkout path all over the .scons files. We'll replace it with a known dummy tree, which we can sed out
-# in the rpm spec.
-# FIXME: There has to be a better way to prevent this .scons mangling.
-for i in `find . |grep "\.scons"`; do
- sed -i "s|$LOCALDIR/chromium-$TODAYSDATE/|/home/spot/sandbox/chromium-$TODAYSDATE/|g" $i
-done
-
-popd
-
-# Now, lets look for the final target directory, without svnrev.
-if [ -d chromium-$FULLVER ]; then
- if [ "$REMOVE" = "true" ]; then
- if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removing conflicting directory: chromium-$FULLVER/\n"
- fi
- rm -rf chromium-$FULLVER/
- if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removed conflicting directory: chromium-$FULLVER/\n"
- fi
- else
- printf "[ERROR]: chromium-$FULLVER/ exists, use -r option to remove it\n"
- exit 2
- fi
-fi
-
-# At this point, we know the chromium target directory does not exist, time to rename the checkout
-if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Renaming checkout directory from: chromium-$TODAYSDATE/ to: chromium-$FULLVER/\n"
-fi
-mv chromium-$TODAYSDATE/ chromium-$FULLVER/
-
-# Now, lets look for the tarball.
-if [ -f chromium-$FULLVER.tar.bz2 ]; then
- if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Found tarball matching chromium-$FULLVER.tar.bz2\n"
- fi
- if [ "$REMOVE" = "true" ]; then
- if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removing conflicting file: chromium-$FULLVER.tar.bz2\n"
- fi
- rm -f chromium-$FULLVER.tar.bz2
- if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Removed conflicting file: chromium-$FULLVER.tar.bz2\n"
- fi
- else
- printf "[ERROR]: chromium-$FULLVER.tar.bz2 exists, use -r option to remove it\n"
- exit 2
- fi
-fi
-
-if [ "$VERBOSE" = "true" ]; then
- printf "[VERBOSE]: Creating tarball: chromium-$FULLVER.tar.bz2\n"
-fi
-tar cfj chromium-$FULLVER.tar.bz2 chromium-$FULLVER
-
-# All done.
-printf "Daily chromium source processed and ready: chromium-$FULLVER.tar.bz2\n"
-exit 0
+++ /dev/null
-diff -up chromium-20090916svn26424/src/base/debug_util_posix.cc.BAD chromium-20090916svn26424/src/base/debug_util_posix.cc
---- chromium-20090916svn26424/src/base/debug_util_posix.cc.BAD 2009-09-16 22:57:39.000000000 -0400
-+++ chromium-20090916svn26424/src/base/debug_util_posix.cc 2009-09-16 22:57:46.000000000 -0400
-@@ -116,9 +116,13 @@ void DebugUtil::BreakDebugger() {
- }
-
- StackTrace::StackTrace() {
-+#if defined(OS_MACOSX)
- if (backtrace == NULL) {
- count_ = 0;
- } else {
-+#else
-+ {
-+#endif
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-@@ -126,14 +130,22 @@ StackTrace::StackTrace() {
- }
-
- void StackTrace::PrintBacktrace() {
-+#if defined(OS_MACOSX)
- if (backtrace_symbols_fd != NULL) {
-+#else
-+ {
-+#endif
- fflush(stderr);
- backtrace_symbols_fd(trace_, count_, STDERR_FILENO);
- }
- }
-
- void StackTrace::OutputToStream(std::ostream* os) {
-+#if defined(OS_MACOSX)
- if (backtrace_symbols != NULL) {
-+#else
-+ {
-+#endif
- scoped_ptr_malloc<char*> trace_symbols(backtrace_symbols(trace_, count_));
-
- // If we can't retrieve the symbols, print an error and just dump the raw
+++ /dev/null
-diff -up chromium-20090916svn26392/src/app/app.gyp.system-icu chromium-20090916svn26392/src/app/app.gyp
---- chromium-20090916svn26392/src/app/app.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/app/app.gyp 2009-09-16 20:08:32.000000000 -0400
-@@ -45,8 +45,7 @@
- '../base/base.gyp:base_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/sqlite/sqlite.gyp:sqlite',
- ],
- 'include_dirs': [
-@@ -191,8 +190,7 @@
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'sources': [
- 'animation_unittest.cc',
-diff -up chromium-20090916svn26392/src/base/base.gyp.system-icu chromium-20090916svn26392/src/base/base.gyp
---- chromium-20090916svn26392/src/base/base.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/base/base.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -11,8 +11,7 @@
- 'target_name': 'base',
- 'type': '<(library)',
- 'dependencies': [
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
- 'sources': [
-@@ -674,7 +673,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',
-@@ -710,7 +709,7 @@
- # TODO(mark): This should not be necessary.
- ['OS == "win"', {
- 'dependencies': [
-- '../third_party/icu/icu.gyp:icudata',
-+ '../build/linux/system.gyp:icu',
- ],
- 'sources!': [
- 'data_pack_unittest.cc',
-diff -up chromium-20090916svn26392/src/build/all.gyp.system-icu chromium-20090916svn26392/src/build/all.gyp
---- chromium-20090916svn26392/src/build/all.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/build/all.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -23,7 +23,6 @@
- '../third_party/bzip2/bzip2.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/lzma_sdk/lzma_sdk.gyp:*',
-diff -up chromium-20090916svn26392/src/build/linux/system.gyp.system-icu chromium-20090916svn26392/src/build/linux/system.gyp
---- chromium-20090916svn26392/src/build/linux/system.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/build/linux/system.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -208,6 +208,26 @@
- ],
- },
- },
-+ {
-+ 'target_name': 'icu',
-+ 'type': 'settings',
-+ '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)',
-+ ],
-+ },
-+ },
-+
-+
-+
- # TODO(evanm): temporarily disabled while we figure out whether to depend
- # on gnome-keyring etc.
- # http://code.google.com/p/chromium/issues/detail?id=12351
-diff -up chromium-20090916svn26392/src/build/temp_gyp/googleurl.gyp.system-icu chromium-20090916svn26392/src/build/temp_gyp/googleurl.gyp
---- chromium-20090916svn26392/src/build/temp_gyp/googleurl.gyp.system-icu 2009-09-16 17:34:31.000000000 -0400
-+++ chromium-20090916svn26392/src/build/temp_gyp/googleurl.gyp 2009-09-16 20:02:05.000000000 -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',
-@@ -59,7 +57,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-20090916svn26392/src/chrome/chrome.gyp.system-icu chromium-20090916svn26392/src/chrome/chrome.gyp
---- chromium-20090916svn26392/src/chrome/chrome.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/chrome/chrome.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -411,8 +411,7 @@
- '../ipc/ipc.gyp:ipc',
- '../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',
- '../build/linux/system.gyp:xml2',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- '../third_party/zlib/zlib.gyp:zlib',
-@@ -681,8 +680,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',
- '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/hunspell/hunspell.gyp:hunspell',
-@@ -2733,8 +2731,7 @@
- 'chrome_strings',
- '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': [
- '..',
-@@ -2782,8 +2779,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',
- '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/hunspell/hunspell.gyp:hunspell',
-@@ -2841,8 +2837,7 @@
- 'chrome_strings',
- '../printing/printing.gyp:printing',
- '../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',
- '../webkit/webkit.gyp:glue',
- '../webkit/webkit.gyp:webkit',
-@@ -3834,8 +3829,7 @@
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../build/linux/system.gyp:xml2',
- ],
- 'include_dirs': [
-@@ -3989,8 +3983,7 @@
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/bzip2/bzip2.gyp:bzip2',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- ],
-@@ -5284,7 +5277,7 @@
- '../third_party/hunspell/hunspell.gyp:hunspell',
- '../net/net.gyp:net_resources',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:libpng',
- '../build/linux/system.gyp:xml2',
- '../third_party/zlib/zlib.gyp:zlib',
-@@ -5417,8 +5410,7 @@
- '../base/base.gyp:test_support_base',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '..',
-@@ -5619,8 +5611,7 @@
- '../webkit/webkit.gyp:webkit',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- ],
-@@ -5846,8 +5837,7 @@
- '../base/base.gyp:test_support_base',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '..',
-diff -up chromium-20090916svn26392/src/net/net.gyp.system-icu chromium-20090916svn26392/src/net/net.gyp
---- chromium-20090916svn26392/src/net/net.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/net/net.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -15,8 +15,7 @@
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../sdch/sdch.gyp:sdch',
- '../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/modp_b64/modp_b64.gyp:modp_b64',
- '../third_party/zlib/zlib.gyp:zlib',
- 'net_resources',
-@@ -414,8 +413,7 @@
- ],
- # Get U_STATIC_IMPLEMENTATION and -I directories on Linux.
- 'dependencies': [
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- },
- ],
-diff -up chromium-20090916svn26392/src/printing/printing.gyp.system-icu chromium-20090916svn26392/src/printing/printing.gyp
---- chromium-20090916svn26392/src/printing/printing.gyp.system-icu 2009-09-16 17:34:26.000000000 -0400
-+++ chromium-20090916svn26392/src/printing/printing.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -16,8 +16,7 @@
- '../base/base.gyp:base_gfx',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
- 'include_dirs': [
-diff -up chromium-20090916svn26392/src/third_party/hunspell/hunspell.gyp.system-icu chromium-20090916svn26392/src/third_party/hunspell/hunspell.gyp
---- chromium-20090916svn26392/src/third_party/hunspell/hunspell.gyp.system-icu 2009-09-16 17:52:08.000000000 -0400
-+++ chromium-20090916svn26392/src/third_party/hunspell/hunspell.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -10,7 +10,7 @@
- 'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
- 'dependencies': [
- '../../base/base.gyp:base',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'defines': [
- 'HUNSPELL_STATIC',
-diff -up chromium-20090916svn26392/src/third_party/sqlite/sqlite.gyp.system-icu chromium-20090916svn26392/src/third_party/sqlite/sqlite.gyp
---- chromium-20090916svn26392/src/third_party/sqlite/sqlite.gyp.system-icu 2009-09-16 17:34:16.000000000 -0400
-+++ chromium-20090916svn26392/src/third_party/sqlite/sqlite.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -190,8 +190,7 @@
- 'src',
- ],
- 'dependencies': [
-- '../icu/icu.gyp:icui18n',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
-@@ -219,7 +218,7 @@
- 'target_name': 'sqlite_shell',
- 'type': 'executable',
- 'dependencies': [
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- 'sqlite',
- ],
- 'sources': [
-diff -up chromium-20090916svn26392/src/views/views.gyp.system-icu chromium-20090916svn26392/src/views/views.gyp
---- chromium-20090916svn26392/src/views/views.gyp.system-icu 2009-09-16 17:34:29.000000000 -0400
-+++ chromium-20090916svn26392/src/views/views.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -43,8 +43,7 @@
- '../app/app.gyp:app_strings',
- '../app/app.gyp:app_resources',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'sources': [
- # All .cc, .h under views, except unittests
-diff -up chromium-20090916svn26392/src/webkit/tools/test_shell/test_shell.gyp.system-icu chromium-20090916svn26392/src/webkit/tools/test_shell/test_shell.gyp
---- chromium-20090916svn26392/src/webkit/tools/test_shell/test_shell.gyp.system-icu 2009-09-16 17:24:50.000000000 -0400
-+++ chromium-20090916svn26392/src/webkit/tools/test_shell/test_shell.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -514,7 +514,7 @@
- 'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
- 'dependencies': [
- '../../../base/base.gyp:base',
-- '../../../third_party/icu/icu.gyp:icuuc',
-+ '../../../build/linux/system.gyp:icu',
- '../../../third_party/npapi/npapi.gyp:npapi',
- ],
- 'sources': [
-diff -up chromium-20090916svn26392/src/webkit/webkit.gyp.system-icu chromium-20090916svn26392/src/webkit/webkit.gyp
---- chromium-20090916svn26392/src/webkit/webkit.gyp.system-icu 2009-09-16 20:02:05.000000000 -0400
-+++ chromium-20090916svn26392/src/webkit/webkit.gyp 2009-09-16 20:02:05.000000000 -0400
-@@ -217,8 +217,7 @@
- 'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
- 'dependencies': [
- 'config',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '../third_party/WebKit/JavaScriptCore',
-@@ -245,8 +244,7 @@
- },
- 'export_dependent_settings': [
- 'config',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
- 'conditions': [
+++ /dev/null
-diff -up chromium-20090916svn26424/src/chrome/browser/autocomplete/autocomplete_popup_model.cc.icu chromium-20090916svn26424/src/chrome/browser/autocomplete/autocomplete_popup_model.cc
---- chromium-20090916svn26424/src/chrome/browser/autocomplete/autocomplete_popup_model.cc.icu 2009-09-16 22:03:33.000000000 -0400
-+++ chromium-20090916svn26424/src/chrome/browser/autocomplete/autocomplete_popup_model.cc 2009-09-16 22:05:14.000000000 -0400
-@@ -11,7 +11,7 @@
- #include "chrome/browser/search_engines/template_url.h"
- #include "chrome/browser/search_engines/template_url_model.h"
- #include "chrome/common/notification_service.h"
--#include "third_party/icu/public/common/unicode/ubidi.h"
-+#include <unicode/ubidi.h>
-
- ///////////////////////////////////////////////////////////////////////////////
- // AutocompletePopupModel
-diff -up chromium-20090916svn26424/src/chrome/browser/spellcheck_worditerator.cc.icu chromium-20090916svn26424/src/chrome/browser/spellcheck_worditerator.cc
---- chromium-20090916svn26424/src/chrome/browser/spellcheck_worditerator.cc.icu 2009-09-16 22:14:29.000000000 -0400
-+++ chromium-20090916svn26424/src/chrome/browser/spellcheck_worditerator.cc 2009-09-16 22:16:22.000000000 -0400
-@@ -11,12 +11,12 @@
- #include "base/string_util.h"
- #include "chrome/browser/spellchecker.h"
-
--#include "third_party/icu/public/common/unicode/normlzr.h"
--#include "third_party/icu/public/common/unicode/schriter.h"
--#include "third_party/icu/public/common/unicode/uchar.h"
--#include "third_party/icu/public/common/unicode/uscript.h"
--#include "third_party/icu/public/common/unicode/uset.h"
--#include "third_party/icu/public/i18n/unicode/ulocdata.h"
-+#include <unicode/normlzr.h>
-+#include <unicode/schriter.h>
-+#include <unicode/uchar.h>
-+#include <unicode/uscript.h>
-+#include <unicode/uset.h>
-+#include <unicode/ulocdata.h>
-
- SpellcheckCharAttribute::SpellcheckCharAttribute() {
- InitializeScriptTable();
--- /dev/null
+--- chromium-browser-5.0.310.0~svn20100130r37603/src/app/gfx/codec/png_codec.cc~ 2010-02-01 16:49:14.000000000 +0200
++++ chromium-browser-5.0.310.0~svn20100130r37603/src/app/gfx/codec/png_codec.cc 2010-02-01 16:49:18.876448844 +0200
+@@ -350,9 +350,9 @@
+ return false;
+
+ *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ NULL,
++ NULL,
++ NULL);
+ if (!*png_ptr)
+ return false;
+
+@@ -574,9 +574,9 @@
+ DCHECK(input_color_components * w <= row_byte_width);
+
+ png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ NULL,
++ NULL,
++ NULL);
+ if (!png_ptr)
+ return false;
+ png_info* info_ptr = png_create_info_struct(png_ptr);
+--- chromium-browser-5.0.312.0~svn20100201r37680/src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp~ 2009-09-26 19:51:49.000000000 +0300
++++ chromium-browser-5.0.312.0~svn20100201r37680/src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2010-02-01 20:35:48.945298200 +0200
+@@ -130,9 +130,9 @@
+ }
+
+ png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
+- png_error_ptr_NULL,
+- png_error_ptr_NULL);
++ NULL,
++ NULL,
++ NULL);
+ if (!pngPtr)
+ return false;
+
+++ /dev/null
-diff -up chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc.no-sqlite-debug chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc
---- chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc.no-sqlite-debug 2009-09-16 20:15:08.000000000 -0400
-+++ chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc 2009-09-16 20:16:20.000000000 -0400
-@@ -42,14 +42,8 @@ class ReleaseSQLErrorHandler : public Va
- public:
- virtual int HandleError(int error, sqlite3* db) {
- error_ = error;
-- // TOD(cpu): Remove this code once it has a few days of air time.
-- if (error == SQLITE_INTERNAL ||
-- error == SQLITE_NOMEM ||
-- error == SQLITE_CORRUPT ||
-- error == SQLITE_IOERR ||
-- error == SQLITE_CONSTRAINT ||
-- error == SQLITE_NOTADB)
-- CHECK(false) << "sqlite fatal error " << error;
-+ // TODO(cpu): need to write to some place so we can trigger
-+ // the diagnostic-repair mode.
- return error;
- }
- };
-@@ -283,8 +277,7 @@ int SQLStatement::prepare(sqlite3* db, c
- DCHECK(!stmt_);
- int rv = sqlite3_prepare_v2(db, sql, sql_len, &stmt_, NULL);
- if (rv != SQLITE_OK) {
-- SQLErrorHandler* error_handler = GetErrorHandlerFactory()->Make();
-- return error_handler->HandleError(rv, db_handle());
-+ DLOG(ERROR) << "SQLStatement.prepare_v2 failed: " << sqlite3_errmsg(db);
- }
- return rv;
- }
+++ /dev/null
-diff -up chromium-20090724svn21567/src/third_party/ffmpeg/ffmpeg.gyp.noffmpeg chromium-20090724svn21567/src/third_party/ffmpeg/ffmpeg.gyp
---- chromium-20090724svn21567/src/third_party/ffmpeg/ffmpeg.gyp.noffmpeg 2009-07-24 22:54:19.000000000 -0400
-+++ chromium-20090724svn21567/src/third_party/ffmpeg/ffmpeg.gyp 2009-07-24 22:54:26.000000000 -0400
-@@ -201,9 +201,6 @@
- ['use_system_ffmpeg==0', {
- 'variables': {
- 'source_files': [
-- 'binaries/<(branding_dir)/libavcodec.so.52',
-- 'binaries/<(branding_dir)/libavformat.so.52',
-- 'binaries/<(branding_dir)/libavutil.so.50',
- ],
- },
- }, {
--- /dev/null
+--- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc~ 2010-01-27 05:02:57.000000000 +0200
++++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc 2010-02-02 11:11:28.576140937 +0200
+@@ -65,6 +65,10 @@
+ PathService::Get(base::DIR_EXE, &dir);
+ plugin_dirs->push_back(dir.Append("plugins"));
+
++ // on PLD Linux we want to search only Chrome specific dirs, but as there is
++ // not user specific dir yet, this leaves us with Chrome system dir only.
++#if 0
++
+ // Mozilla code to reference:
+ // http://mxr.mozilla.org/firefox/ident?i=NS_APP_PLUGINS_DIR_LIST
+ // and tens of accompanying files (mxr is very helpful).
+@@ -101,6 +105,7 @@
+ plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
+ plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
+ #endif
++#endif
+ }
+
+ void PluginList::LoadPluginsFromDir(const FilePath& path,
+++ /dev/null
-diff -up chromium-20090916svn26424/src/app/app.gyp.system-gyp chromium-20090916svn26424/src/app/app.gyp
---- chromium-20090916svn26424/src/app/app.gyp.system-gyp 2009-09-16 20:37:14.000000000 -0400
-+++ chromium-20090916svn26424/src/app/app.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -193,7 +193,6 @@
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
- ],
- 'sources': [
- 'animation_unittest.cc',
-@@ -220,6 +219,7 @@
- # projects are generated by GYP.
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ['OS!="win"', {
-diff -up chromium-20090916svn26424/src/base/base.gyp.system-gyp chromium-20090916svn26424/src/base/base.gyp
---- chromium-20090916svn26424/src/base/base.gyp.system-gyp 2009-09-16 20:40:38.000000000 -0400
-+++ chromium-20090916svn26424/src/base/base.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -493,7 +493,7 @@
- ],
- },
- { # else: OS != "win"
-- 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
-+ 'dependencies': ['../build/linux/system.gyp:event'],
- 'sources!': [
- 'third_party/purify/pure_api.c',
- 'base_drag_source.cc',
-diff -up chromium-20090916svn26424/src/build/all.gyp.system-gyp chromium-20090916svn26424/src/build/all.gyp
---- chromium-20090916svn26424/src/build/all.gyp.system-gyp 2009-09-16 20:40:29.000000000 -0400
-+++ chromium-20090916svn26424/src/build/all.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -26,8 +26,6 @@
- '../third_party/icu/icu.gyp:*',
- '../third_party/libjpeg/libjpeg.gyp:*',
- '../third_party/libpng/libpng.gyp:*',
-- '../third_party/libxml/libxml.gyp:*',
-- '../third_party/libxslt/libxslt.gyp:*',
- '../third_party/lzma_sdk/lzma_sdk.gyp:*',
- '../third_party/modp_b64/modp_b64.gyp:*',
- '../third_party/npapi/npapi.gyp:*',
-@@ -41,7 +39,7 @@
- 'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
-- '../v8/tools/gyp/v8.gyp:*',
-+ 'linux/system.gyp:v8',
- ],
- }],
- ['OS=="linux"', {
-@@ -77,7 +75,7 @@
- ],
- }, {
- 'dependencies': [
-- '../third_party/libevent/libevent.gyp:*',
-+ '../build/linux/system.gyp:event',
- ],
- }],
- ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
-diff -up chromium-20090916svn26424/src/build/linux/system.gyp.system-gyp chromium-20090916svn26424/src/build/linux/system.gyp
---- chromium-20090916svn26424/src/build/linux/system.gyp.system-gyp 2009-09-16 20:40:29.000000000 -0400
-+++ chromium-20090916svn26424/src/build/linux/system.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -161,6 +161,70 @@
- ],
- },
- },
-+ {
-+ 'target_name': 'xml2',
-+ 'type': 'settings',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags libxml-2.0)',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l libxml-2.0)',
-+ ],
-+ },
-+ },
-+ {
-+ 'target_name': 'xslt',
-+ 'type': 'settings',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags libxslt)',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l libxslt)',
-+ ],
-+ },
-+ },
-+ {
-+ 'target_name': 'event',
-+ 'type': 'settings',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ ],
-+ 'libraries': [
-+ '-levent',
-+ ],
-+ },
-+ },
-+ {
-+ 'target_name': 'v8',
-+ 'type': 'settings',
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ ],
-+ 'libraries': [
-+ '-lv8',
-+ ],
-+ },
-+ },
- # TODO(evanm): temporarily disabled while we figure out whether to depend
- # on gnome-keyring etc.
- # http://code.google.com/p/chromium/issues/detail?id=12351
-diff -up chromium-20090916svn26424/src/chrome/chrome.gyp.system-gyp chromium-20090916svn26424/src/chrome/chrome.gyp
---- chromium-20090916svn26424/src/chrome/chrome.gyp.system-gyp 2009-09-16 20:41:23.000000000 -0400
-+++ chromium-20090916svn26424/src/chrome/chrome.gyp 2009-09-16 21:23:09.000000000 -0400
-@@ -413,7 +413,7 @@
- '../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- '../third_party/zlib/zlib.gyp:zlib',
- '../third_party/npapi/npapi.gyp:npapi',
-@@ -628,6 +628,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'export_dependent_settings': [
- '../third_party/sqlite/sqlite.gyp:sqlite',
-@@ -682,7 +683,7 @@
- '../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/hunspell/hunspell.gyp:hunspell',
- '../webkit/webkit.gyp:glue',
-@@ -2235,6 +2236,7 @@
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:gtkprint',
- '../build/linux/system.gyp:nss',
-+ '../build/linux/system.gyp:xml2',
- '../base/base.gyp:linux_versioninfo',
- ],
- 'sources!': [
-@@ -2774,6 +2776,7 @@
- ['OS=="linux" or OS=="freebsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ],
-@@ -2790,7 +2793,7 @@
- '../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/hunspell/hunspell.gyp:hunspell',
- '../webkit/webkit.gyp:glue',
-@@ -2958,6 +2961,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- '../sandbox/sandbox.gyp:sandbox',
- ],
- }],
-@@ -2995,6 +2999,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ],
-@@ -3192,6 +3197,7 @@
- '<@(chromium_dependencies)',
- # Needed for chrome_dll_main.cc #include of gtk/gtk.h
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'sources': [
- 'app/chrome_dll_main.cc',
-@@ -3701,6 +3707,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ['OS=="win"', {
-@@ -3746,6 +3753,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ['OS!="win"', {
-@@ -3779,6 +3787,7 @@
- # test/unit/chrome_test_suite.h
- # gtk/gtk.h
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ],
-@@ -3795,7 +3804,7 @@
- 'theme_resources',
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../testing/gtest.gyp:gtest',
- ],
- 'include_dirs': [
-@@ -3836,7 +3845,7 @@
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'include_dirs': [
- '..',
-@@ -3888,6 +3897,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'sources!': [
- # TODO(port)
-@@ -3990,7 +4000,7 @@
- '../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- ],
- 'include_dirs': [
-@@ -4301,6 +4311,7 @@
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'sources': [
- 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
-@@ -4481,6 +4492,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ['OS=="linux" and toolkit_views==1', {
-@@ -4603,6 +4615,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
-@@ -4667,6 +4680,8 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- ],
-@@ -5233,6 +5248,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'sources!': [
- # TODO(port):
-@@ -5279,7 +5295,7 @@
- '../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/libpng/libpng.gyp:libpng',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/zlib/zlib.gyp:zlib',
- '../testing/gtest.gyp:gtest',
- '../third_party/npapi/npapi.gyp:npapi',
-@@ -5307,6 +5323,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- 'sources!': [
- # TODO(port)
-@@ -5613,7 +5630,7 @@
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../third_party/npapi/npapi.gyp:npapi',
- ],
- 'include_dirs': [
-@@ -5660,6 +5677,7 @@
- ['OS=="linux"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:xml2',
- ],
- }],
- # Windows-specific rules.
-@@ -5983,8 +6001,8 @@
- 'test_support_ui',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/libxml/libxml.gyp:libxml',
-- '../third_party/libxslt/libxslt.gyp:libxslt',
-+ '../build/linux/system.gyp:xml2',
-+ '../build/linux/system.gyp:xslt',
- '../third_party/npapi/npapi.gyp:npapi',
- ],
- 'include_dirs': [
-diff -up chromium-20090916svn26424/src/net/net.gyp.system-gyp chromium-20090916svn26424/src/net/net.gyp
---- chromium-20090916svn26424/src/net/net.gyp.system-gyp 2009-09-16 20:40:08.000000000 -0400
-+++ chromium-20090916svn26424/src/net/net.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -369,7 +369,7 @@
- 'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
-- '../v8/tools/gyp/v8.gyp:v8',
-+ '../build/linux/system.gyp:v8',
- ],
- }],
- [ 'OS == "linux"', {
-diff -up chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp.system-gyp chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp
---- chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp.system-gyp 2009-09-16 20:37:18.000000000 -0400
-+++ chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -15,7 +15,7 @@
- '../../net/net.gyp:net_resources',
- '../../third_party/icu/icu.gyp:icui18n',
- '../../third_party/icu/icu.gyp:icuuc',
-- '../../third_party/libxml/libxml.gyp:libxml',
-+ '../build/linux/system.gyp:xml2',
- '../../third_party/npapi/npapi.gyp:npapi',
- '../webkit.gyp:webkit_resources',
- '../webkit.gyp:webkit_strings',
-diff -up chromium-20090916svn26424/src/webkit/webkit.gyp.system-gyp chromium-20090916svn26424/src/webkit/webkit.gyp
---- chromium-20090916svn26424/src/webkit/webkit.gyp.system-gyp 2009-09-16 20:39:51.000000000 -0400
-+++ chromium-20090916svn26424/src/webkit/webkit.gyp 2009-09-16 21:19:27.000000000 -0400
-@@ -334,8 +334,8 @@
- '../skia/skia.gyp:skia',
- '../third_party/libjpeg/libjpeg.gyp:libjpeg',
- '../third_party/libpng/libpng.gyp:libpng',
-- '../third_party/libxml/libxml.gyp:libxml',
-- '../third_party/libxslt/libxslt.gyp:libxslt',
-+ '../build/linux/system.gyp:xml2',
-+ '../build/linux/system.gyp:xslt',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- ],
-@@ -751,10 +751,10 @@
- 'conditions': [
- ['javascript_engine=="v8"', {
- 'dependencies': [
-- '../v8/tools/gyp/v8.gyp:v8',
-+ '../build/linux/system.gyp:v8',
- ],
- 'export_dependent_settings': [
-- '../v8/tools/gyp/v8.gyp:v8',
-+ '../build/linux/system.gyp:v8',
- ],
- }],
- ['OS=="linux" or OS=="freebsd"', {
-@@ -1472,6 +1472,7 @@
- ['OS=="linux" or OS=="freebsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
-+ '../build/linux/system.gyp:nss',
- '../base/base.gyp:linux_versioninfo',
- ],
- 'export_dependent_settings': [
-diff -up chromium-20090827svn24640/src/base/message_pump_libevent.cc.system-code chromium-20090827svn24640/src/base/message_pump_libevent.cc
---- chromium-20090827svn24640/src/base/message_pump_libevent.cc.system-code 2009-08-27 15:21:27.000000000 -0400
-+++ chromium-20090827svn24640/src/base/message_pump_libevent.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -12,7 +12,7 @@
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
--#include "third_party/libevent/event.h"
-+#include <event.h>
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
diff -up chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code chromium-20090827svn24640/src/base/pr_time_unittest.cc
--- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code 2009-08-27 15:21:27.000000000 -0400
+++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 16:05:17.000000000 -0400
#include "base/logging.h"
-diff -up chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc.system-code chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc
---- chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc.system-code 2009-08-27 15:22:41.000000000 -0400
-+++ chromium-20090827svn24640/src/chrome/browser/debugger/devtools_remote_listen_socket.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -18,7 +18,7 @@
- #include "base/message_loop.h"
- #include "base/message_pump_libevent.h"
- #include "net/base/net_errors.h"
--#include "third_party/libevent/event.h"
-+#include <event.h>
- #endif
-
- #include "base/eintr_wrapper.h"
diff -up chromium-20090827svn24640/src/chrome/common/zip.cc.system-code chromium-20090827svn24640/src/chrome/common/zip.cc
--- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code 2009-08-27 15:22:46.000000000 -0400
+++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 16:05:17.000000000 -0400
#if defined(OS_WIN)
#include "third_party/zlib/contrib/minizip/iowin32.h"
#endif
-diff -up chromium-20090827svn24640/src/net/base/listen_socket.cc.system-code chromium-20090827svn24640/src/net/base/listen_socket.cc
---- chromium-20090827svn24640/src/net/base/listen_socket.cc.system-code 2009-08-27 15:20:57.000000000 -0400
-+++ chromium-20090827svn24640/src/net/base/listen_socket.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -13,7 +13,7 @@
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include "net/base/net_errors.h"
--#include "third_party/libevent/event.h"
-+#include <event.h>
- #endif
-
- #include "base/eintr_wrapper.h"
-diff -up chromium-20090827svn24640/src/net/base/telnet_server.cc.system-code chromium-20090827svn24640/src/net/base/telnet_server.cc
---- chromium-20090827svn24640/src/net/base/telnet_server.cc.system-code 2009-08-27 15:20:57.000000000 -0400
-+++ chromium-20090827svn24640/src/net/base/telnet_server.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -13,7 +13,7 @@
- #include <sys/socket.h>
- #include "base/message_loop.h"
- #include "net/base/net_errors.h"
--#include "third_party/libevent/event.h"
-+#include <event.h>
- #include "base/message_pump_libevent.h"
- #endif
-
-diff -up chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc.system-code chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc
---- chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc.system-code 2009-08-27 15:20:55.000000000 -0400
-+++ chromium-20090827svn24640/src/net/socket/tcp_client_socket_libevent.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -15,7 +15,7 @@
- #include "base/trace_event.h"
- #include "net/base/io_buffer.h"
- #include "net/base/net_errors.h"
--#include "third_party/libevent/event.h"
-+#include <event.h>
-
-
- namespace net {
-diff -up chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc.system-code chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc
---- chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc.system-code 2009-08-27 15:19:05.000000000 -0400
-+++ chromium-20090827svn24640/src/webkit/glue/plugins/plugin_lib_linux.cc 2009-08-27 16:10:57.000000000 -0400
+--- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_linux.cc~ 2010-01-07 23:19:11.000000000 +0200
++++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_linux.cc 2010-02-02 09:16:08.740140511 +0200
@@ -13,7 +13,7 @@
// These headers must be included in this order to make the declaration gods
// happy.
-#include "base/third_party/nspr/prcpucfg_linux.h"
+#include <prcpucfg.h>
- #include "third_party/mozilla/include/nsplugindefs.h"
namespace {
+
+--- chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc~ 2010-01-20 05:02:33.000000000 +0200
++++ chromium-browser-5.0.312.0~svn20100201r37680/src/chrome/browser/metrics/metrics_log.cc 2010-02-02 09:17:14.496849280 +0200
+@@ -12,7 +12,7 @@
+ #include "base/scoped_ptr.h"
+ #include "base/string_util.h"
+ #include "base/sys_info.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <prtime.h>
+ #include "chrome/browser/autocomplete/autocomplete.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/common/logging_chrome.h"
projects / packages / chromium-browser.git / commitdiff