diff mbox series

[v4,6/7] libwpe: Add patch to support builds with CMake 4+

Message ID 20250702123005.1233743-7-Moritz.Haase@bmw.de
State New
Headers show
Series cmake: Major version bump to 4.0.3 | expand

Commit Message

Haase Moritz, JD-62 July 2, 2025, 12:30 p.m. UTC 
PR [0] has been filed upstream, but isn't merged yet.

[0]: https://github.com/WebPlatformForEmbedded/libwpe/pull/136

Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
---
changes in v4:
- Fix patch formatting

changes in v3:
- Commit added to series
---
 ...red-CMake-version-to-3.5-to-allow-bu.patch | 38 +++++++++++++++++++
 meta/recipes-sato/webkit/libwpe_1.16.2.bb     |  6 ++-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
diff mbox series

Patch

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
new file mode 100644
index 0000000000..05688ee463
--- /dev/null
+++ b/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
@@ -0,0 +1,38 @@ 
+From 7b227c7c1ac226498b1ea3987f87350d0f14f49f Mon Sep 17 00:00:00 2001
+From: Moritz Haase <Moritz.Haase@bmw.de>
+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 <min> value.  Or, use the <min>...<max> syntax
+      to tell CMake that the project requires at least <min> but has been
+      updated to work with policies introduced by <max> 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 <Moritz.Haase@bmw.de>
+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
index 324e2f213c..6cb6818acc 100644
--- a/meta/recipes-sato/webkit/libwpe_1.16.2.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.16.2.bb
@@ -10,9 +10,11 @@  inherit cmake features_check pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
+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
-# ipstream directory contains tarballs for other components as well.
+# upstream directory contains tarballs for other components as well.
 UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar"