diff options
Diffstat (limited to 'poky/meta/recipes-sato')
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch | 33 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk/snprintf.patch | 15 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb (renamed from poky/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb) | 14 |
3 files changed, 37 insertions, 25 deletions
diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch new file mode 100644 index 0000000000..e550a0d457 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch @@ -0,0 +1,33 @@ +From 4bc241539246f7a17d07357257ab47cb96bc4b69 Mon Sep 17 00:00:00 2001 +From: "ysuzuki@apple.com" <ysuzuki@apple.com> +Date: Thu, 18 Apr 2019 07:30:18 +0000 +Subject: [PATCH] Unreviewed, fix build failure + https://bugs.webkit.org/show_bug.cgi?id=195938 + +Including <array>. + +* bmalloc/AvailableMemory.cpp: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244422 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Upstream-Status: Backport [https://github.com/WebKit/webkit/commit/84c111dc0d83b5acf60706ef49bc2f5e91112471] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/bmalloc/bmalloc/AvailableMemory.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/bmalloc/bmalloc/AvailableMemory.cpp b/Source/bmalloc/bmalloc/AvailableMemory.cpp +index 595889fe..b72000d5 100644 +--- a/Source/bmalloc/bmalloc/AvailableMemory.cpp ++++ b/Source/bmalloc/bmalloc/AvailableMemory.cpp +@@ -32,6 +32,7 @@ + #include "PerProcess.h" + #include "Scavenger.h" + #include "Sizes.h" ++#include <array> + #include <mutex> + #if BOS(DARWIN) + #if BPLATFORM(IOS_FAMILY) +-- +2.22.0 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/snprintf.patch b/poky/meta/recipes-sato/webkit/webkitgtk/snprintf.patch deleted file mode 100644 index b1481d78e8..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/snprintf.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 { - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb index 891266b220..c42c3de69f 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.2.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.24.3.bb @@ -22,12 +22,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://detect-gstreamer-gl.patch \ file://include_array.patch \ file://narrowing.patch \ - file://snprintf.patch \ file://0001-gstreamer-add-a-missing-format-string.patch \ + file://0001-Unreviewed-fix-build-failure-https-bugs.webkit.org-s.patch \ " -SRC_URI[md5sum] = "83012998e1b9f71abb37d8baf6f9c7e6" -SRC_URI[sha256sum] = "019cb1f0d05bf6148b72c7a85734bcd006388a1c14132843ef9a1b2cb7b4321c" +SRC_URI[md5sum] = "e2a5bbd09a217eba096a2d1562143e35" +SRC_URI[sha256sum] = "940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -43,8 +43,6 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ gettext-native glib-2.0 glib-2.0-native libtasn1 \ " -COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains('DEFAULTTUNE', 'mips', 'null', 'mips.*-linux', d)}" - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \ enchant \ @@ -90,14 +88,10 @@ EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " -# binutils 2.25.1 has a bug on aarch64: -# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 -EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " -EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " # JIT not supported on MIPS either -EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " # JIT not supported on X32 # An attempt was made to upstream JIT support for x32 in |