diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-04-19 18:27:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-26 10:09:08 +0100 |
commit | 852808d4c1e20004ae5e2319889e2766401173c1 (patch) | |
tree | d60f482c15f68df8fc3a0e0b7a229c42b4ff0476 /meta/recipes-sato/webkit/webkitgtk | |
parent | 97f7d3970235f3c1775f9101d2873370bcad22c3 (diff) | |
download | poky-852808d4c1e20004ae5e2319889e2766401173c1.tar.gz |
webkitgtk: Fix build with clang
Newer version of webkitgtk has some compile failures with clang/libc++
combination.
(From OE-Core rev: f1741a8209e56cdf51223678239a680d8788f71f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/include_array.patch | 15 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/narrowing.patch | 31 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/snprintf.patch | 15 |
3 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_array.patch b/meta/recipes-sato/webkit/webkitgtk/include_array.patch new file mode 100644 index 0000000000..7268b04bf4 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/include_array.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Added missing include for std::array | ||
2 | |||
3 | Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | --- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700 | ||
7 | +++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700 | ||
8 | @@ -31,6 +31,7 @@ | ||
9 | #include <elf.h> | ||
10 | #include <fcntl.h> | ||
11 | #include <mutex> | ||
12 | +#include <array> | ||
13 | #include <sys/mman.h> | ||
14 | #include <sys/stat.h> | ||
15 | #include <sys/syscall.h> | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch new file mode 100644 index 0000000000..598b6b5df5 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Fix build with clang on arm where char is unsigned | ||
2 | |||
3 | Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | --- a/Source/WebCore/contentextensions/DFACombiner.cpp | ||
7 | +++ b/Source/WebCore/contentextensions/DFACombiner.cpp | ||
8 | @@ -37,7 +37,7 @@ namespace WebCore { | ||
9 | namespace ContentExtensions { | ||
10 | |||
11 | class DFAMerger { | ||
12 | - typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList; | ||
13 | + typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList; | ||
14 | |||
15 | enum class WhichDFA { | ||
16 | A, | ||
17 | --- a/Source/WebCore/contentextensions/NFAToDFA.cpp | ||
18 | +++ b/Source/WebCore/contentextensions/NFAToDFA.cpp | ||
19 | @@ -41,9 +41,9 @@ namespace WebCore { | ||
20 | |||
21 | namespace ContentExtensions { | ||
22 | |||
23 | -typedef MutableRange<char, NFANodeIndexSet> NFANodeRange; | ||
24 | -typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList; | ||
25 | -typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; | ||
26 | +typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange; | ||
27 | +typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList; | ||
28 | +typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; | ||
29 | typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList; | ||
30 | typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures; | ||
31 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/snprintf.patch b/meta/recipes-sato/webkit/webkitgtk/snprintf.patch new file mode 100644 index 0000000000..b1481d78e8 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/snprintf.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | include missing header for snprintf definition | ||
2 | |||
3 | Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197088] | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | --- a/Source/WebCore/platform/text/TextCodec.cpp | ||
7 | +++ b/Source/WebCore/platform/text/TextCodec.cpp | ||
8 | @@ -28,6 +28,7 @@ | ||
9 | #include "TextCodec.h" | ||
10 | |||
11 | #include <array> | ||
12 | +#include <cstdio> | ||
13 | |||
14 | namespace WebCore { | ||
15 | |||