diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-15 15:50:32 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-17 18:45:07 +0200 |
| commit | 5ef63aaeab687b5aa63810b1225bfbc52f7461da (patch) | |
| tree | d7283270d0028a86d21b64018bfcd73b1f943a3e /patches/patch-chromium.sh | |
| parent | 6af569360b798dfc6af31dc504b79d74aa58c77e (diff) | |
Add patch for WebKit after updating Chromium.
Including Assertions.h leads to __darwin_ssize_t being
defined inside namespace WebKit but not outside that namespace.
This is because certain headers will not be pulled in again
later on in the same compilation unit.
This patch has already been upstreamed,
and can be removed with the next Chromium update.
Change-Id: I302bbf779fcabb909a9ffda53d8b9fdccc87e248
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches/patch-chromium.sh')
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 09748f032..a1fa4261b 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -70,6 +70,7 @@ cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch +git am $PATCH_DIR/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch cd $CHROMIUM_SRC_DIR/tools/gyp echo "Entering $PWD" |