diff options
Diffstat (limited to 'extra/chromium/chromium-gcc-4.6.patch')
| -rw-r--r-- | extra/chromium/chromium-gcc-4.6.patch | 64 |
1 files changed, 1 insertions, 63 deletions
diff --git a/extra/chromium/chromium-gcc-4.6.patch b/extra/chromium/chromium-gcc-4.6.patch index 95532a2eb..b5e61dc30 100644 --- a/extra/chromium/chromium-gcc-4.6.patch +++ b/extra/chromium/chromium-gcc-4.6.patch @@ -31,17 +31,6 @@ diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h 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 @@ -79,9 +68,9 @@ diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chro --- 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 "system-alloc.h" +#include <cstddef> namespace tcmalloc { @@ -97,17 +86,6 @@ diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/ch 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 @@ -119,43 +97,3 @@ diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h 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/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 <thierry.reding@avionic-design.de> -+ -+ 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 <ddkilzer@apple.com> - - |