From 4e39c2548580addd3e05ccee5faf8de3df9cffb6 Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Wed, 24 Sep 2025 07:55:36 +0200 Subject: 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...required-CMake-version-to-3.5-to-allow-bu.patch | 38 ---------------------- meta/recipes-sato/webkit/libwpe_1.16.2.bb | 20 ------------ meta/recipes-sato/webkit/libwpe_1.16.3.bb | 19 +++++++++++ 3 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch delete mode 100644 meta/recipes-sato/webkit/libwpe_1.16.2.bb create mode 100644 meta/recipes-sato/webkit/libwpe_1.16.3.bb (limited to 'meta/recipes-sato/webkit') 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 @@ -From 7b227c7c1ac226498b1ea3987f87350d0f14f49f Mon Sep 17 00:00:00 2001 -From: Moritz Haase -Date: Wed, 2 Jul 2025 09:19:44 +0200 -Subject: [PATCH] cmake: Bump required CMake version to 3.5 to allow builds - with CMake 4+ - -This enables builds with CMake 4+, fixing: - - CMake Error at CMakeLists.txt:1 (cmake_minimum_required): - Compatibility with CMake < 3.5 has been removed from CMake. - - Update the VERSION argument value. Or, use the ... syntax - to tell CMake that the project requires at least but has been - updated to work with policies introduced by or earlier. - - Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. - -While at it, remove the extra call to 'cmake_policy()'. When passing the same -version as to 'cmake_minimum_required()' it's not needed, as the latter calls -the former automatically. - -Signed-off-by: Moritz Haase -Upstream-Status: Submitted [https://github.com/WebPlatformForEmbedded/libwpe/pull/136] ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index db9ae50..2a01daf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,4 @@ --cmake_minimum_required(VERSION 3.0) --cmake_policy(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - include(VersioningUtils) diff --git a/meta/recipes-sato/webkit/libwpe_1.16.2.bb b/meta/recipes-sato/webkit/libwpe_1.16.2.bb deleted file mode 100644 index 6cb6818acc..0000000000 --- a/meta/recipes-sato/webkit/libwpe_1.16.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." -HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" -BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" -DEPENDS = "virtual/egl libxkbcommon" - -inherit cmake features_check pkgconfig - -REQUIRED_DISTRO_FEATURES = "opengl" - -SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch \ - " -SRC_URI[sha256sum] = "960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7" - -# This is a tweak of upstream-version-is-even needed because -# upstream directory contains tarballs for other components as well. -UPSTREAM_CHECK_REGEX = "libwpe-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar" diff --git a/meta/recipes-sato/webkit/libwpe_1.16.3.bb b/meta/recipes-sato/webkit/libwpe_1.16.3.bb new file mode 100644 index 0000000000..abfc631a5b --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe_1.16.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "General-purpose library specifically developed for the WPE-flavored port of WebKit." +HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe" +BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" +DEPENDS = "virtual/egl libxkbcommon" + +inherit cmake features_check pkgconfig + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz \ + " +SRC_URI[sha256sum] = "c880fa8d607b2aa6eadde7d6d6302b1396ebc38368fe2332fa20e193c7ee1420" + +# This is a tweak of upstream-version-is-even needed because +# upstream directory contains tarballs for other components as well. +UPSTREAM_CHECK_REGEX = "libwpe-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar" -- cgit v1.2.3-54-g00ecf