summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Haase <Moritz.Haase@bmw.de>2025-09-24 07:55:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-25 11:09:05 +0100
commit4e39c2548580addd3e05ccee5faf8de3df9cffb6 (patch)
treeb2fa4c9d2ca969c28889d09cc7182324604cdc89
parent2423dc098c92c6077d28823c0d6f8ad6bb2ccb6c (diff)
downloadpoky-4e39c2548580addd3e05ccee5faf8de3df9cffb6.tar.gz
libwpe: upgrade 1.16.2 -> 1.16.3
Release notes are available at [0]. The new release contains a CMake-related patch that we can now drop. [0]: https://github.com/WebPlatformForEmbedded/libwpe/releases/tag/1.16.3 (From OE-Core rev: 40bc1667e4137da70453af3def94ec02d0e6c37d) Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch38
-rw-r--r--meta/recipes-sato/webkit/libwpe_1.16.3.bb (renamed from meta/recipes-sato/webkit/libwpe_1.16.2.bb)3
2 files changed, 1 insertions, 40 deletions
diff --git a/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch b/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
deleted file mode 100644
index 05688ee463..0000000000
--- a/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 7b227c7c1ac226498b1ea3987f87350d0f14f49f Mon Sep 17 00:00:00 2001
2From: Moritz Haase <Moritz.Haase@bmw.de>
3Date: Wed, 2 Jul 2025 09:19:44 +0200
4Subject: [PATCH] cmake: Bump required CMake version to 3.5 to allow builds
5 with CMake 4+
6
7This enables builds with CMake 4+, fixing:
8
9 CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
10 Compatibility with CMake < 3.5 has been removed from CMake.
11
12 Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
13 to tell CMake that the project requires at least <min> but has been
14 updated to work with policies introduced by <max> or earlier.
15
16 Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
17
18While at it, remove the extra call to 'cmake_policy()'. When passing the same
19version as to 'cmake_minimum_required()' it's not needed, as the latter calls
20the former automatically.
21
22Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
23Upstream-Status: Submitted [https://github.com/WebPlatformForEmbedded/libwpe/pull/136]
24---
25 CMakeLists.txt | 3 +--
26 1 file changed, 1 insertion(+), 2 deletions(-)
27
28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index db9ae50..2a01daf 100644
30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt
32@@ -1,5 +1,4 @@
33-cmake_minimum_required(VERSION 3.0)
34-cmake_policy(VERSION 3.0)
35+cmake_minimum_required(VERSION 3.5)
36
37 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
38 include(VersioningUtils)
diff --git a/meta/recipes-sato/webkit/libwpe_1.16.2.bb b/meta/recipes-sato/webkit/libwpe_1.16.3.bb
index 6cb6818acc..abfc631a5b 100644
--- a/meta/recipes-sato/webkit/libwpe_1.16.2.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.16.3.bb
@@ -11,9 +11,8 @@ inherit cmake features_check pkgconfig
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-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch \
15 " 14 "
16SRC_URI[sha256sum] = "960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7" 15SRC_URI[sha256sum] = "c880fa8d607b2aa6eadde7d6d6302b1396ebc38368fe2332fa20e193c7ee1420"
17 16
18# This is a tweak of upstream-version-is-even needed because 17# This is a tweak of upstream-version-is-even needed because
19# upstream directory contains tarballs for other components as well. 18# upstream directory contains tarballs for other components as well.