mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
From ccf8a58c3536ca0e62748e0ea477514e14d821bc Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Thu, 4 Aug 2022 12:19:05 +0300
|
||||
Subject: [PATCH] Fix build failure due to libc++ using libc functions
|
||||
|
||||
Include the "alloc-private.h" header after the C++ standard library
|
||||
headers. This sidesteps build failures caused by implementations of
|
||||
std::map and std::string which use libc memory allocation functions
|
||||
in expanded templates after they have been marked with the "poison"
|
||||
pragma.
|
||||
|
||||
Fixes #115
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
src/pasteboard-generic.cpp | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pasteboard-generic.cpp b/src/pasteboard-generic.cpp
|
||||
index 86fe4ee..a357027 100644
|
||||
--- a/src/pasteboard-generic.cpp
|
||||
+++ b/src/pasteboard-generic.cpp
|
||||
@@ -26,12 +26,15 @@
|
||||
|
||||
#include "pasteboard-private.h"
|
||||
|
||||
-#include "alloc-private.h"
|
||||
-#include <cstdlib>
|
||||
-#include <cstring>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
+// We need to include this header last, in order to avoid template expansions
|
||||
+// from the C++ standard library happening after it forbids usage of the libc
|
||||
+// memory functions.
|
||||
+#include "alloc-private.h"
|
||||
+#include <cstring>
|
||||
+
|
||||
namespace Generic {
|
||||
using Pasteboard = std::map<std::string, std::string>;
|
||||
}
|
||||
@@ -10,10 +10,8 @@ inherit cmake features_check pkgconfig
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "opengl"
|
||||
|
||||
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Fix-build-failure-due-to-libc-using-libc-functions.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "4ac4fd0a8b562b721bffd0f46ae9f06c2b5a3114407581978be875a9d651642a"
|
||||
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "b84fdbfbc849ce4fdf084bb28b58e5463b1b4b6cc8f200dc77b41f8545d5329d"
|
||||
|
||||
# This is a tweak of upstream-version-is-even needed because
|
||||
# ipstream directory contains tarballs for other components as well.
|
||||
Reference in New Issue
Block a user