From 264bada0c545685a3cc58473d034ef382810c702 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Dec 2025 15:26:38 +0100 Subject: [PATCH] package/pulseview: fix cmake 4 compatibility Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...ate-version-range-from-2.8-to-3.31.5.patch | 38 +++++++++++++++++++ ...t-Fix-the-version-for-the-manual-too.patch | 26 +++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch create mode 100644 package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch diff --git a/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch b/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch new file mode 100644 index 0000000000..2233887ab5 --- /dev/null +++ b/package/pulseview/0004-CMakeLists.txt-Update-version-range-from-2.8-to-3.31.5.patch @@ -0,0 +1,38 @@ +From c0676b3493fda29d97c271cfeb76267019b35695 Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Thu, 15 May 2025 16:38:53 +0200 +Subject: [PATCH] CMakeLists.txt: Update version range from 2.8 to 3.31.5 to + avoid abort + +The error with CMake 4 on the github CI looks like this: + +CMake Error at CMakeLists.txt:22 (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. + +Upstream: http://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=c0676b3493fda29d97c271cfeb76267019b35695 + +Signed-off-by: Bernd Kuhls +[backported to 0.4.2] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec86073d..8580fa8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ + ## along with this program. If not, see . + ## + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 2.8.12...3.31.5) + + include(GNUInstallDirs) + diff --git a/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch b/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch new file mode 100644 index 0000000000..8c7518dd6e --- /dev/null +++ b/package/pulseview/0005-CMakeLists.txt-Fix-the-version-for-the-manual-too.patch @@ -0,0 +1,26 @@ +From e2fe9dfb91c7de85c410922ee9268c3f526bcc54 Mon Sep 17 00:00:00 2001 +From: Soeren Apel +Date: Thu, 15 May 2025 18:19:24 +0200 +Subject: [PATCH] CMakeLists.txt: Fix the version for the manual, too + +Upstream: https://github.com/sigrokproject/pulseview/commit/e2fe9dfb91c7de85c410922ee9268c3f526bcc54 + +Signed-off-by: Bernd Kuhls +[backported to 0.4.2] +--- + manual/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt +index 3b881a56..d6c54d61 100644 +--- a/manual/CMakeLists.txt ++++ b/manual/CMakeLists.txt +@@ -17,7 +17,7 @@ + ## along with this program. If not, see . + ## + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 2.8.12...3.31.5) + + # External dependencies, required and optional tools. + find_program(ASCIIDOCTOR_EXECUTABLE NAMES asciidoctor)