Date: Saturday, April 30, 2011 @ 14:01:22 Author: pierre Revision: 121333
upgpkg: chromium 11.0.696.57-1 upstream update Added: chromium/trunk/gcc-4.6.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-webkit-version.patch -------------------------------+ PKGBUILD | 15 ++- chromium-webkit-version.patch | 40 --------- gcc-4.6.patch | 171 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-30 15:35:02 UTC (rev 121332) +++ PKGBUILD 2011-04-30 18:01:22 UTC (rev 121333) @@ -4,7 +4,7 @@ # Maintainer: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=10.0.648.205 +pkgver=11.0.696.57 pkgrel=1 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.' arch=('i686' 'x86_64') @@ -16,17 +16,20 @@ conflicts=('chromium-browser') install=chromium.install source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"; - 'chromium.desktop' 'chromium.sh' chromium-webkit-version.patch) -md5sums=('4ec08f2718d43038b88487034a96c8f5' + 'chromium.desktop' 'chromium.sh' 'gcc-4.6.patch') +md5sums=('f17a37a2d4a2f344f0a11288600e296c' '075c3c2fa5902e16b8547dd31d437191' '096a46ef386817988250d2d7bddd1b34' - 'dee3e8798f8916d23fce203478094822') + 'ab7934b4a57206707cca69be0d18638e') build() { cd ${srcdir}/chromium-${pkgver} - #http://code.google.com/p/chromium/issues/detail?id=70537 - patch -Np1 -i ${srcdir}/chromium-webkit-version.patch + # patches to fix gcc 4.6 compilation from + # http://code.google.com/p/chromium/issues/detail?id=80071 + # http://code.google.com/p/chromium/issues/detail?id=70746 + # http://code.google.com/p/chromium/issues/detail?id=46411 + patch -p0 -i ${srcdir}/gcc-4.6.patch ### Configure Deleted: chromium-webkit-version.patch =================================================================== --- chromium-webkit-version.patch 2011-04-30 15:35:02 UTC (rev 121332) +++ chromium-webkit-version.patch 2011-04-30 18:01:22 UTC (rev 121333) @@ -1,40 +0,0 @@ -Index: webkit/build/webkit_version.py -diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py -index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755 ---- a/webkit/build/webkit_version.py -+++ b/webkit/build/webkit_version.py -@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file): - - # "svn info" tells us what we want, but third_party/WebKit does *not* - # point at the upstream repo. So instead we run svn info on the directory -- # containing the versioning file (which is some subdirectory of WebKit), -- # then strip that path back off of the resulting URL. -+ # containing the versioning file (which is some subdirectory of WebKit). - version_file_dir = os.path.dirname(version_file) - version_info = lastchange.FetchVersionInfo( - default_lastchange=None, - directory=os.path.join(webkit_dir, version_file_dir)) - -- # Now compute the real WebKit URL by stripping off the version file -- # directory from the URL we get out of version_info. -- # Further, we want to strip off the "http://svn..."; from the left. -- # This is the root URL from the repository. -- assert version_info.url.startswith(version_info.root) -- assert version_info.url.endswith(version_file_dir) -- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -- webkit_url = webkit_url.strip('/') -+ if (version_info.url.startswith(version_info.root) and -+ version_info.url.endswith(version_file_dir)): -+ # Now compute the real WebKit URL by stripping off the version file -+ # directory from the URL we get out of version_info. -+ # Further, we want to strip off the "http://svn..."; from the left. -+ # This is the root URL from the repository. -+ webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -+ webkit_url = webkit_url.strip('/') -+ else: -+ # The data isn't as we expect: perhaps they're using git without svn? -+ # Just dump the output directly. -+ webkit_url = version_info.url - - return "%s@%s" % (webkit_url, version_info.revision) - Added: gcc-4.6.patch =================================================================== --- gcc-4.6.patch (rev 0) +++ gcc-4.6.patch 2011-04-30 18:01:22 UTC (rev 121333) @@ -0,0 +1,171 @@ +diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h +--- chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-13 13:23:41.000000000 +0400 ++++ chrome/browser/search_engines/template_url_prepopulate_data.h 2011-04-20 19:32:58.000000000 +0400 +@@ -7,6 +7,7 @@ + #pragma once + + #include <vector> ++#include <cstddef> + + class GURL; + class PrefService; +diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h +--- gpu/command_buffer/common/types.h 2011-04-13 13:22:57.000000000 +0400 ++++ gpu/command_buffer/common/types.h 2011-04-20 19:32:58.000000000 +0400 +@@ -11,6 +11,7 @@ + #include <stdint.h> + #endif + #include <string> ++#include <cstddef> + + typedef signed char schar; + typedef signed char int8; +diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h +--- ppapi/cpp/paint_aggregator.h 2011-04-13 13:22:58.000000000 +0400 ++++ ppapi/cpp/paint_aggregator.h 2011-04-20 20:11:44.000000000 +0400 +@@ -9,6 +9,7 @@ + + #include "ppapi/cpp/point.h" + #include "ppapi/cpp/rect.h" ++#include <cstddef> + + namespace pp { + +diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h +--- third_party/libjingle/source/talk/base/sigslot.h 2011-04-13 13:25:41.000000000 +0400 ++++ third_party/libjingle/source/talk/base/sigslot.h 2011-04-20 20:00:43.000000000 +0400 +@@ -80,6 +80,7 @@ + + #include <set> + #include <list> ++#include <cstddef> + + // On our copy of sigslot.h, we force single threading + #define SIGSLOT_PURE_ISO +diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc +--- third_party/ots/src/os2.cc 2011-04-13 13:24:06.000000000 +0400 ++++ third_party/ots/src/os2.cc 2011-04-20 19:45:44.000000000 +0400 +@@ -5,6 +5,7 @@ + #include "os2.h" + + #include "head.h" ++#include <cstddef> + + // OS/2 - OS/2 and Windows Metrics + // http://www.microsoft.com/opentype/otspec/os2.htm +diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h +--- third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h 2011-04-20 19:32:58.000000000 +0400 +@@ -38,6 +38,7 @@ + #include <config.h> + + #include <limits> ++#include <cstddef> + + #include "base/basictypes.h" + #include "base/logging.h" +diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h +--- third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/base/vdso_support.h 2011-04-20 19:32:58.000000000 +0400 +@@ -37,6 +37,7 @@ + + #define HAVE_VDSO_SUPPORT 1 + ++#include <cstddef> + #include <stdlib.h> // for NULL + #include <link.h> // for ElfW + #include "base/basictypes.h" +diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc +--- third_party/tcmalloc/chromium/src/common.cc 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/common.cc 2011-04-20 19:32:58.000000000 +0400 +@@ -34,6 +34,7 @@ + #include "system-alloc.h" + #include "config.h" + #include "common.h" ++#include <cstddef> + + namespace tcmalloc { + +diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h +--- third_party/tcmalloc/chromium/src/symbolize.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/symbolize.h 2011-04-20 19:32:58.000000000 +0400 +@@ -38,6 +38,7 @@ + #include <stdint.h> // for uintptr_t + #endif + #include <map> ++#include <cstddef> + + using std::map; + +diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h +--- third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-13 13:23:04.000000000 +0400 ++++ third_party/tcmalloc/chromium/src/system-alloc.h 2011-04-20 19:32:58.000000000 +0400 +@@ -37,6 +37,7 @@ + #define TCMALLOC_SYSTEM_ALLOC_H_ + + #include <config.h> ++#include <cstddef> + #include "internal_logging.h" + + // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment +diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h +--- ui/gfx/codec/jpeg_codec.h 2011-04-13 13:23:45.000000000 +0400 ++++ ui/gfx/codec/jpeg_codec.h 2011-04-20 19:32:58.000000000 +0400 +@@ -7,6 +7,7 @@ + #pragma once + + #include <vector> ++#include <cstddef> + + class SkBitmap; + +--- ppapi/cpp/paint_aggregator.h 2010-12-23 18:10:27.000000000 -0600 ++++ ppapi/cpp/paint_aggregator.h~ 2011-04-19 05:34:56.085582885 -0500 +@@ -5,6 +5,7 @@ + #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_ + #define PPAPI_CPP_PAINT_AGGREGATOR_H_ + ++#include <cstddef> + #include <vector> + + #include "ppapi/cpp/point.h" +Index: Source/WebCore/dom/make_names.pl +=================================================================== +--- third_party/WebKit/Source/WebCore/dom/make_names.pl (revision 73989) ++++ third_party/WebKit/Source/WebCore/dom/make_names.pl (revision 84123) +@@ -66,5 +66,5 @@ + $gccLocation = "/usr/bin/gcc"; + } +-my $preprocessor = $gccLocation . " -E -P -x c++"; ++my $preprocessor = $gccLocation . " -E -x c++"; + + GetOptions( +Index: Source/WebCore/ChangeLog +=================================================================== +--- third_party/WebKit/Source/WebCore/ChangeLog (revision 84120) ++++ third_party/WebKit/Source/WebCore/ChangeLog (revision 84123) +@@ -1,2 +1,24 @@ ++2011-04-17 Thierry Reding <[email protected]> ++ ++ Reviewed by Adam Barth. ++ ++ Fix build with GCC 4.6. ++ ++ * dom/make_names.pl: Execute preprocessor without the -P option. The ++ preprocessor in GCC 4.6 eats empty lines, effectively breaking the ++ parsing performed by this script. Dropping the -P option when invoking ++ the preprocessor keeps the empty lines but as a side-effect also adds ++ additional linemarkers. ++ ++ From the cpp manpage: ++ ++ -P Inhibit generation of linemarkers in the output from the ++ preprocessor. This might be useful when running the preprocessor ++ on something that is not C code, and will be sent to a program ++ which might be confused by the linemarkers. ++ ++ The linemarkers are not problematic, however, because the script ++ properly handles them by ignoring all lines starting with a #. ++ + 2011-04-17 David Kilzer <[email protected]> +
