gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-31 10:58:21 -07:00
Code Issues Projects Releases Wiki Activity

sci-electronics/pulseview: Fix build w/ cmake-4

Browse Source 
Closes: https://bugs.gentoo.org/955760
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-05-26 20:28:48 +02:00
parent e126bd299e
commit ab5b4e4bee
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sci-electronics/pulseview/files/pulseview-0.4.2-cmake4.patch Normal file
View File

@@ -0,0 +1,47 @@
From: Soeren Apel <redacted>
Date: Thu, 15 May 2025 14:38:53 +0000 (+0200)
Subject: CMakeLists.txt: Update version range from 2.8 to 3.31.5 to avoid abort
X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=c0676b3493fda29d97c271cfeb76267019b35695
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 <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.
CMakeLists.txt: Fix the version for the manual, too
---
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 <http://www.gnu.org/licenses/>.
##
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12...3.31.5)
project(pulseview C CXX)
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 <http://www.gnu.org/licenses/>.
##
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12...3.31.5)
project(PV_MANUAL)

3
sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
View File

@@ -41,7 +41,8 @@ DOCS=( HACKING NEWS README )
PATCHES=(
"${FILESDIR}/${P}-qt-5.15.patch"
"${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch
"${FILESDIR}"/${P}-glib-2.68.patch
"${FILESDIR}"/${P}-cmake4.patch # bug #955760
)
src_prepare() {