mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

webkitgtk: Fix build with clang

Browse Source 
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>
This commit is contained in:
Khem Raj
2019-04-19 18:27:38 -07:00
committed by Richard Purdie
parent 97f7d39702
commit 852808d4c1
4 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
meta/recipes-sato/webkit/webkitgtk/include_array.patch Normal file
View File

@@ -0,0 +1,15 @@
Added missing include for std::array
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp.org 2019-04-18 18:03:50.226231691 -0700
+++ webkitgtk-2.24.0/Source/JavaScriptCore/assembler/PerfLog.cpp 2019-04-18 18:07:28.569153989 -0700
@@ -31,6 +31,7 @@
#include <elf.h>
#include <fcntl.h>
#include <mutex>
+#include <array>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/syscall.h>

31
meta/recipes-sato/webkit/webkitgtk/narrowing.patch Normal file
View File

@@ -0,0 +1,31 @@
Fix build with clang on arm where char is unsigned
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/Source/WebCore/contentextensions/DFACombiner.cpp
+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
namespace ContentExtensions {
class DFAMerger {
- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
enum class WhichDFA {
A,
--- a/Source/WebCore/contentextensions/NFAToDFA.cpp
+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
@@ -41,9 +41,9 @@ namespace WebCore {
namespace ContentExtensions {
-typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
-typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
-typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;

15
meta/recipes-sato/webkit/webkitgtk/snprintf.patch Normal file
View File

@@ -0,0 +1,15 @@
include missing header for snprintf definition
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197088]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/Source/WebCore/platform/text/TextCodec.cpp
+++ b/Source/WebCore/platform/text/TextCodec.cpp
@@ -28,6 +28,7 @@
#include "TextCodec.h"
#include <array>
+#include <cstdio>
namespace WebCore {

3
meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
View File

@@ -20,6 +20,9 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
file://0001-Fix-build-with-musl.patch \
file://detect-gstreamer-gl.patch \
file://include_array.patch \
file://narrowing.patch \
file://snprintf.patch \
"
SRC_URI[md5sum] = "576d69c598b3e36c73441052d02466de"