Newer version of webkitgtk has some compile failures with clang/libc++ combination.
Signed-off-by: Khem Raj <raj.k...@gmail.com> --- .../webkit/webkitgtk/include_array.patch | 15 +++++++++ .../webkit/webkitgtk/narrowing.patch | 31 +++++++++++++++++++ .../webkit/webkitgtk/snprintf.patch | 15 +++++++++ meta/recipes-sato/webkit/webkitgtk_2.24.0.bb | 3 ++ 4 files changed, 64 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/include_array.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch create mode 100644 meta/recipes-sato/webkit/webkitgtk/snprintf.patch 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 @@ +Added missing include for std::array + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197085] +Signed-off-by: Khem Raj <raj.k...@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> 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 @@ +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.k...@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; + 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 @@ +include missing header for snprintf definition + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197088] +Signed-off-by: Khem Raj <raj.k...@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 { + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb index 4a82dae9ef..a023a369f7 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb @@ -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" -- 2.21.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core