diff options
Diffstat (limited to 'poky/meta/recipes-sato')
12 files changed, 157 insertions, 146 deletions
diff --git a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 531571ee8..1027ec03b 100644 --- a/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -4,8 +4,12 @@ DESCRIPTION += "Also includes ptest packages." IMAGE_FEATURES += "ptest-pkgs" -# This image is sufficiently large (~3GB) that it can't actually fit in a live +# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 500MB. +# box) and explicitly add just 1500MB. +# strace-ptest in particular needs more than 500MB IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "524288" +IMAGE_ROOTFS_EXTRA_SPACE = "1524288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" diff --git a/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.0.bb b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb index 356da02d2..a5e3a1ad3 100644 --- a/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.0.bb +++ b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.3.1.bb @@ -16,8 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://emblem-symbolic-link.png \ file://no-desktop.patch" -SRC_URI[md5sum] = "827838f7f6b17dc97e1690c07da8fdb3" -SRC_URI[sha256sum] = "5a693e9bf3f3294f0ee7264c1c1a600a88ee27d1572e7dd5c4b0e84aa7778ffb" +SRC_URI[md5sum] = "d32ad2c9c7c52bff2004bbc120b53420" +SRC_URI[sha256sum] = "6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" diff --git a/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch b/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch new file mode 100644 index 000000000..9ac62015d --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch @@ -0,0 +1,33 @@ +From 035467aa0abfbc0de7e5d24543d4aab37301593c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2019 21:56:57 -0800 +Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in + do_row() + +This fixes below error on some architectures e.g. RISC-V + +pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] 455 | memset(deduced, DOT, (size_t)len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pattern.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pattern.c b/pattern.c +index 45b1b0c..f73a4c2 100644 +--- a/pattern.c ++++ b/pattern.c +@@ -428,7 +428,7 @@ static int do_row(unsigned char *known, unsigned char *deduced, + unsigned char *row, + unsigned char *minpos_done, unsigned char *maxpos_done, + unsigned char *minpos_ok, unsigned char *maxpos_ok, +- unsigned char *start, int len, int step, int *data, ++ unsigned char *start, size_t len, int step, int *data, + unsigned int *changed + #ifdef STANDALONE_SOLVER + , const char *rowcol, int index, int cluewid +-- +2.21.0 + diff --git a/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch new file mode 100644 index 000000000..7218d620e --- /dev/null +++ b/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch @@ -0,0 +1,25 @@ +puzzles: avoid compiler unitialized variable error + +The compiler does not realize that we must go through the while() +loop at least once, so we replace it with a for() loop. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- a/tree234.c ++++ b/tree234.c +@@ -326,8 +326,11 @@ static void *add234_internal(tree234 *t, + return orig_e; + } + +- n = t->root; +- while (n) { ++ /* ++ * We know t->root is not NULL. The logic ++ * to break out of this is at the end of the loop. ++ */ ++ for (n = t->root;;) { + LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", + n, + n->kids[0], n->counts[0], n->elems[0], diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 7d08b964f..59b952522 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -13,6 +13,8 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://0001-Use-labs-instead-of-abs.patch \ file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ + file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \ + file://fix-ki-uninitialized.patch \ " UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch deleted file mode 100644 index 25f484659..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a5d4e038268ae23486fecc1966fd2e16a7f40ce8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 25 Jul 2018 00:23:48 -0700 -Subject: [PATCH] Fix PaintingData' has no member named 'lightVector' on - ARM_NEON - -* platform/graphics/cpu/arm/filters/FELightingNEON.h: -(WebCore::FELighting::platformApplyNeon): - -Upstream-Status: Submitted -https://bugs.webkit.org/show_bug.cgi?id=187991 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index 42af922..b542a4c 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - neonData.flags |= FLAG_CONE_EXPONENT_IS_1; - } else { - ASSERT(m_lightSource->type() == LS_DISTANT); -- floatArguments.lightX = paintingData.lightVector.x(); -- floatArguments.lightY = paintingData.lightVector.y(); -- floatArguments.lightZ = paintingData.lightVector.z(); -+ floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); -+ floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); -+ floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); - floatArguments.padding2 = 1; - } - --- -2.10.2 - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch index 041ec4675..d9a18e0ce 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001 +From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 6 Oct 2017 17:00:08 +0300 Subject: [PATCH] Fix build with musl @@ -7,69 +7,69 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - Source/JavaScriptCore/runtime/MachineContext.h | 18 +++++++++++++++++- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- Source/WTF/wtf/Platform.h | 2 +- - 2 files changed, 18 insertions(+), 2 deletions(-) + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index bf0bdc7..84b8a8a 100644 +index 836d755..7665d25 100644 --- a/Source/JavaScriptCore/runtime/MachineContext.h +++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) +@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) #if CPU(X86) return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) +@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) +@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) +@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) -@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) +@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) // The following sequence depends on glibc's sys/ucontext.h. #if CPU(X86) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 551c047..e50b05a 100644 +index a841946..1e5c7dd 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h -@@ -683,7 +683,7 @@ +@@ -701,7 +701,7 @@ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 #endif --#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) #define HAVE_MACHINE_CONTEXT 1 #endif diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 923d00c4b..3e03aa968 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch @@ -1,4 +1,4 @@ -From f9767a479111f9c6f280c43176c33de50aee7f66 Mon Sep 17 00:00:00 2001 +From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 28 Oct 2015 14:18:57 +0200 Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the @@ -11,14 +11,28 @@ Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - Source/WebKit/PlatformGTK.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Source/JavaScriptCore/PlatformGTK.cmake | 2 +- + Source/WebKit/PlatformGTK.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake +index 0b2968d2..2742ad80 100644 +--- a/Source/JavaScriptCore/PlatformGTK.cmake ++++ b/Source/JavaScriptCore/PlatformGTK.cmake +@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + DEPENDS JavaScriptCore +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} + --quiet diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index dc6b306..a074a80 100644 +index e36e4c35..943f9794 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake -@@ -732,7 +732,7 @@ if (ENABLE_INTROSPECTION) +@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir DEPENDS WebKit DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @@ -27,7 +41,7 @@ index dc6b306..a074a80 100644 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" ${INTROSPECTION_SCANNER} --quiet -@@ -774,7 +774,7 @@ if (ENABLE_INTROSPECTION) +@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch deleted file mode 100644 index a3f759927..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch +++ /dev/null @@ -1,44 +0,0 @@ -Backport patch to fix CVE-2017-17821. Refer to -https://security-tracker.debian.org/tracker/CVE-2017-17821. - -Upstream-Status: Backport [https://trac.webkit.org/changeset/232119/webkit] -CVE: CVE-2017-17821 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From 2a17b15297eb886b0bfb7d098ef607cfad6c3da0 Mon Sep 17 00:00:00 2001 -From: "mcatanzaro@igalia.com" - <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Wed, 23 May 2018 17:54:01 +0000 -Subject: [PATCH] Prohibit shrinking the FastBitVector - https://bugs.webkit.org/show_bug.cgi?id=181020 - -Reviewed by Oliver Hunt. - -Prohibit shrinking the FastBitVector. It's not prepared for this and the current usage does -not require it. - -* wtf/FastBitVector.cpp: -(WTF::FastBitVectorWordOwner::resizeSlow): - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232119 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/wtf/FastBitVector.cpp | 2 ++ - 2 files changed, 15 insertions(+) - -diff --git a/Source/WTF/wtf/FastBitVector.cpp b/Source/WTF/wtf/FastBitVector.cpp -index eed316975f4..8b019aaa3ed 100644 ---- a/Source/WTF/wtf/FastBitVector.cpp -+++ b/Source/WTF/wtf/FastBitVector.cpp -@@ -42,6 +42,8 @@ void FastBitVectorWordOwner::setEqualsSlow(const FastBitVectorWordOwner& other) - void FastBitVectorWordOwner::resizeSlow(size_t numBits) - { - size_t newLength = fastBitVectorArrayLength(numBits); -+ -+ RELEASE_ASSERT(newLength >= arrayLength()); - - // Use fastCalloc instead of fastRealloc because we expect the common - // use case for this method to be initializing the size of the bitvector. --- -2.17.0 - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch deleted file mode 100644 index 78fd4dc79..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 59f6903ad96f3213f248b672d5fd526cc0d666ce Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 20 May 2018 14:28:27 -0700 -Subject: [PATCH] soup: Forward declare URL class - -This helps getting away with compiler errors seen with clang - -/mnt/a/oe/workspace/sources/webkitgtk/Source/WebCore/platform/network/soup/SoupNetworkSession.h:68:62: -error: unknown type name 'URL' - static std::optional<ResourceError> checkTLSErrors(const URL&, -GTlsCertificate*, GTlsCertificateFlags); - ^ -Upstream-Status: Backport [https://trac.webkit.org/changeset/231876/webkit] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -index 03bd72ba..7ca8792d 100644 ---- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h -+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h -@@ -43,6 +43,7 @@ namespace WebCore { - - class CertificateInfo; - class ResourceError; -+class URL; - struct SoupNetworkProxySettings; - - class SoupNetworkSession { diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch b/poky/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch new file mode 100644 index 000000000..9d0d50b79 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch @@ -0,0 +1,35 @@ +unbreak build with libc++ 7 + +based on +https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812 + +Fixes + +/usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access' +class _LIBCPP_EXCEPTION_ABI bad_optional_access + ^ +DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here +class bad_optional_access : public std::logic_error { + ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/Source/WTF/wtf/Optional.h ++++ b/Source/WTF/wtf/Optional.h +@@ -276,14 +276,14 @@ struct nullopt_t + }; + constexpr nullopt_t nullopt{nullopt_t::init()}; + +- ++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000 + // 20.5.8, class bad_optional_access + class bad_optional_access : public std::logic_error { + public: + explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {} + explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {} + }; +- ++# endif // _LIBCPP_VERSION < 7000 + + template <class T> + union storage_t diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb index 7f1ffcea4..301bf10ce 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb @@ -20,13 +20,11 @@ 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://0012-soup-Forward-declare-URL-class.patch \ - file://0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch \ - file://0001-webkitgtk-fix-CVE-2017-17821.patch \ + file://bad_optional_access.patch \ " -SRC_URI[md5sum] = "72a05f6a4dc1c78b079590a8fd280401" -SRC_URI[sha256sum] = "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990" +SRC_URI[md5sum] = "47386c10a9c3975f933c85404f35ff3b" +SRC_URI[sha256sum] = "4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -72,6 +70,13 @@ EXTRA_OECMAKE = " \ EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF " EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF " +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS_append_arc = " -mlong-calls" +CXXFLAGS_append_arc = " -mlong-calls" + # Javascript JIT is not supported on powerpc EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " @@ -101,6 +106,8 @@ EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " SECURITY_CFLAGS_remove_aarch64 = "-fpie" SECURITY_CFLAGS_append_aarch64 = " -fPIE" +LDFLAGS_append_toolchain-clang = " -rtlib=compiler-rt" + FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" @@ -122,3 +129,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" # Segmentation fault GI_DATA_ENABLED_armv7a = "False" GI_DATA_ENABLED_armv7ve = "False" + +# Can't be built with ccache +CCACHE_DISABLE = "1" |