summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-08-30 12:09:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-01 10:14:01 +0100
commitedd67f10fa1bcc3b51dfe4eb23752ea5db5c2b94 (patch)
treeb084d4dd9cfdc1cb2cd77517deeeb23d448efc15 /meta/recipes-sato/webkit
parentf6b55c02d980c7a70abe53b1bcfcbe071c6e3a30 (diff)
downloadpoky-edd67f10fa1bcc3b51dfe4eb23752ea5db5c2b94.tar.gz
libwpe: upgrade 1.12.2 -> 1.12.3
Changelog: Fix the build when using Clang's libc++ or the Musl libc. 0001-Fix-build-failure-due-to-libc-using-libc-functions.patch removed since it's included in 1.12.3 (From OE-Core rev: f8d8cc58c9b9c221158414be186bc12aa5d80e91) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/libwpe/0001-Fix-build-failure-due-to-libc-using-libc-functions.patch42
-rw-r--r--meta/recipes-sato/webkit/libwpe_1.12.3.bb (renamed from meta/recipes-sato/webkit/libwpe_1.12.2.bb)6
2 files changed, 2 insertions, 46 deletions
diff --git a/meta/recipes-sato/webkit/libwpe/0001-Fix-build-failure-due-to-libc-using-libc-functions.patch b/meta/recipes-sato/webkit/libwpe/0001-Fix-build-failure-due-to-libc-using-libc-functions.patch
deleted file mode 100644
index 6d27b4835d..0000000000
--- a/meta/recipes-sato/webkit/libwpe/0001-Fix-build-failure-due-to-libc-using-libc-functions.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From ccf8a58c3536ca0e62748e0ea477514e14d821bc Mon Sep 17 00:00:00 2001
2From: Adrian Perez de Castro <aperez@igalia.com>
3Date: Thu, 4 Aug 2022 12:19:05 +0300
4Subject: [PATCH] Fix build failure due to libc++ using libc functions
5
6Include the "alloc-private.h" header after the C++ standard library
7headers. This sidesteps build failures caused by implementations of
8std::map and std::string which use libc memory allocation functions
9in expanded templates after they have been marked with the "poison"
10pragma.
11
12Fixes #115
13
14Upstream-Status: Backport
15Signed-off-by: Alexander Kanavin <alex@linutronix.de>
16---
17 src/pasteboard-generic.cpp | 9 ++++++---
18 1 file changed, 6 insertions(+), 3 deletions(-)
19
20diff --git a/src/pasteboard-generic.cpp b/src/pasteboard-generic.cpp
21index 86fe4ee..a357027 100644
22--- a/src/pasteboard-generic.cpp
23+++ b/src/pasteboard-generic.cpp
24@@ -26,12 +26,15 @@
25
26 #include "pasteboard-private.h"
27
28-#include "alloc-private.h"
29-#include <cstdlib>
30-#include <cstring>
31 #include <map>
32 #include <string>
33
34+// We need to include this header last, in order to avoid template expansions
35+// from the C++ standard library happening after it forbids usage of the libc
36+// memory functions.
37+#include "alloc-private.h"
38+#include <cstring>
39+
40 namespace Generic {
41 using Pasteboard = std::map<std::string, std::string>;
42 }
diff --git a/meta/recipes-sato/webkit/libwpe_1.12.2.bb b/meta/recipes-sato/webkit/libwpe_1.12.3.bb
index e23a9ac32d..77ca517ef7 100644
--- a/meta/recipes-sato/webkit/libwpe_1.12.2.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.12.3.bb
@@ -10,10 +10,8 @@ inherit cmake features_check pkgconfig
10 10
11REQUIRED_DISTRO_FEATURES = "opengl" 11REQUIRED_DISTRO_FEATURES = "opengl"
12 12
13SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz \ 13SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
14 file://0001-Fix-build-failure-due-to-libc-using-libc-functions.patch \ 14SRC_URI[sha256sum] = "b84fdbfbc849ce4fdf084bb28b58e5463b1b4b6cc8f200dc77b41f8545d5329d"
15 "
16SRC_URI[sha256sum] = "4ac4fd0a8b562b721bffd0f46ae9f06c2b5a3114407581978be875a9d651642a"
17 15
18# This is a tweak of upstream-version-is-even needed because 16# This is a tweak of upstream-version-is-even needed because
19# ipstream directory contains tarballs for other components as well. 17# ipstream directory contains tarballs for other components as well.