diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-05 18:32:03 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:03:56 +0000 |
commit | f83e0cb7f5e6b50356cc456f90cee471a5b7c39b (patch) | |
tree | 7acec18cecc6c1133384b3ccb19c077d26967670 /meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | |
parent | 8d93c2ae4d0678b130d43262946188b963686a3a (diff) | |
download | poky-f83e0cb7f5e6b50356cc456f90cee471a5b7c39b.tar.gz |
webkitgtk: update to 2.18.3
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no
longer present in upstream tree. However, a patch with different musl fixes
has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Disable Gstreamer GL support on x86 due to clashing headers problem.
(From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch index 12836f28f2..c6157e1037 100644 --- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | |||
@@ -1,22 +1,31 @@ | |||
1 | From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 May 2017 22:34:24 -0700 | ||
4 | Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 | ||
5 | |||
1 | Taken from | 6 | Taken from |
2 | https://bugs.webkit.org/show_bug.cgi?id=161900 | 7 | https://bugs.webkit.org/show_bug.cgi?id=161900 |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
6 | 11 | ||
7 | Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | 12 | --- |
8 | =================================================================== | 13 | Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- |
9 | --- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt | 14 | 1 file changed, 9 insertions(+), 1 deletion(-) |
10 | +++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | 15 | |
11 | @@ -182,7 +182,6 @@ set(WTF_HEADERS | 16 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt |
17 | index 6b5e45b9..46ee3c22 100644 | ||
18 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
19 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
20 | @@ -205,7 +205,6 @@ set(WTF_HEADERS | ||
12 | 21 | ||
13 | set(WTF_SOURCES | 22 | set(WTF_SOURCES |
14 | Assertions.cpp | 23 | Assertions.cpp |
15 | - Atomics.cpp | 24 | - Atomics.cpp |
16 | AutomaticThread.cpp | 25 | AutomaticThread.cpp |
17 | BitVector.cpp | 26 | BitVector.cpp |
18 | ClockType.cpp | 27 | CPUTime.cpp |
19 | @@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) | 28 | @@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) |
20 | list(APPEND WTF_LIBRARIES bmalloc) | 29 | list(APPEND WTF_LIBRARIES bmalloc) |
21 | endif () | 30 | endif () |
22 | 31 | ||
@@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt | |||
32 | list(APPEND WTF_SOURCES | 41 | list(APPEND WTF_SOURCES |
33 | unicode/icu/CollatorICU.cpp | 42 | unicode/icu/CollatorICU.cpp |
34 | ) | 43 | ) |
44 | -- | ||
45 | 2.14.1 | ||
46 | |||