diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit/webkitgtk/x32_support.patch | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.tar.gz |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/x32_support.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/x32_support.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch index fea4c27147..5f23837585 100644 --- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch +++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch | |||
@@ -3,11 +3,11 @@ Subject: Fix FTBFS in x32 | |||
3 | Bug-Debian: https://bugs.debian.org/700795 | 3 | Bug-Debian: https://bugs.debian.org/700795 |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
6 | Index: webkitgtk/Source/WTF/wtf/Platform.h | 6 | Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h |
7 | =================================================================== | 7 | =================================================================== |
8 | --- webkitgtk.orig/Source/WTF/wtf/Platform.h | 8 | --- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h |
9 | +++ webkitgtk/Source/WTF/wtf/Platform.h | 9 | +++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h |
10 | @@ -182,8 +182,12 @@ | 10 | @@ -172,7 +172,11 @@ |
11 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ | 11 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ |
12 | #if defined(__x86_64__) \ | 12 | #if defined(__x86_64__) \ |
13 | || defined(_M_X64) | 13 | || defined(_M_X64) |
@@ -15,8 +15,7 @@ Index: webkitgtk/Source/WTF/wtf/Platform.h | |||
15 | +#define WTF_CPU_X86_64_32 1 | 15 | +#define WTF_CPU_X86_64_32 1 |
16 | +#else | 16 | +#else |
17 | #define WTF_CPU_X86_64 1 | 17 | #define WTF_CPU_X86_64 1 |
18 | #endif | ||
19 | +#endif | 18 | +#endif |
19 | #define WTF_CPU_X86_SSE2 1 | ||
20 | #endif | ||
20 | 21 | ||
21 | /* CPU(ARM64) - Apple */ | ||
22 | #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) | ||