[packages/cmake] - updated to 3.31.7; now defaults to Qt6

[qboosh]

commit 44074edf8d9f0d8ef3476ef704a60545655a19ac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 12 21:34:53 2025 +0200

    - updated to 3.31.7; now defaults to Qt6

 cmake.spec                      | 35 +++++++++++++++++++++++------------
 disable-completness-check.patch |  6 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index f73d2f3..248b024 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -11,18 +11,19 @@
 # Conditional build:
 %bcond_with	bootstrap	# use internal versions of some libraries
 %bcond_without	gui		# gui package
+%bcond_with	qt5		# Qt5 instead of Qt6
 %bcond_with	tests		# perform "make test"
 %bcond_without	doc		# documentation
 
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.30.3
+Version:	3.31.7
 Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://cmake.org/files/v3.30/%{name}-%{version}.tar.gz
-# Source0-md5:	4ca6d3265a257627a2e1c955affb2ba3
+Source0:	https://cmake.org/files/v3.31/%{name}-%{version}.tar.gz
+# Source0-md5:	44758a8e220b4251064a56e6e6df8ae1
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-libx32.patch
 Patch2:		%{name}-jni.patch
@@ -31,11 +32,6 @@ Patch4:		%{name}-findruby2.patch
 Patch5:		disable-completness-check.patch
 URL:		https://cmake.org/
 # system zlib,bzip2,xz,zstd used only when without system libarchive
-%if %{with gui}
-BuildRequires:	Qt5Core-devel >= 5.0
-BuildRequires:	Qt5Gui-devel >= 5.0
-BuildRequires:	Qt5Widgets-devel >= 5.0
-%endif
 BuildRequires:	automake
 BuildRequires:	cppdap-devel
 BuildRequires:	curl-devel
@@ -50,8 +46,6 @@ BuildRequires:	libuv-devel >= 1.28.0
 BuildRequires:	ncurses-devel > 5.9-3
 BuildRequires:	ncurses-ext-devel > 5.9-3
 BuildRequires:	nghttp2-devel
-%{?with_gui:BuildRequires:	qt5-build >= 5.0}
-%{?with_gui:BuildRequires:	qt5-qmake >= 5.0}
 BuildRequires:	rhash-devel
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 2.025
@@ -59,6 +53,21 @@ BuildRequires:	rpmbuild(macros) >= 2.025
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
+%if %{with gui}
+%if %{with qt5}
+BuildRequires:	Qt5Core-devel >= 5.0
+BuildRequires:	Qt5Gui-devel >= 5.0
+BuildRequires:	Qt5Widgets-devel >= 5.0
+BuildRequires:	qt5-build >= 5.0
+BuildRequires:	qt5-qmake >= 5.0
+%else
+BuildRequires:	Qt6Core-devel >= 6.0
+BuildRequires:	Qt6Gui-devel >= 6.0
+BuildRequires:	Qt6Widgets-devel >= 6.0
+BuildRequires:	qt6-build >= 6.0
+BuildRequires:	qt6-qmake >= 6.0
+%endif
+%endif
 Requires:	filesystem >= 3.0-52
 Requires:	libarchive >= 3.3.3
 Requires:	libuv >= 1.28.0
@@ -154,6 +163,9 @@ cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_SYSCONFDIR "%{_sysconfdir}" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_DATADIR "%{_datadir}" CACHE PATH " " FORCE)
+%if %{with qt5}
+SET (CMake_QT_MAJOR_VERSION "5" CACHE STRING " " FORCE)
+%endif
 SET (CMAKE_SYSTEM_NAME "Linux" CACHE STRING " " FORCE)
 SET (CMAKE_SYSTEM_VERSION "%(uname -r)" CACHE STRING " " FORCE)
 SET (CMAKE_CROSSCOMPILING FALSE CACHE BOOL " " FORCE)
@@ -180,7 +192,7 @@ export LDFLAGS="%{rpmldflags}"
 	--init=init.cmake \
 	%{!?with_bootstrap:--system-libs} \
 	%{?with_gui:--qt-gui} \
-	--qt-qmake=%{_bindir}/qmake-qt5 \
+	--qt-qmake=%{_bindir}/qmake-qt%{?with_qt5:5}%{!?with_qt5:6} \
 	%{?with_doc:--sphinx-html} \
 	%{?with_doc:--sphinx-man} \
 	%{?__jobs:--parallel=%{__jobs}} \
@@ -249,7 +261,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cmake/Help
 %endif
 # top cmake/Modules dirs belong to filesystem
-%{_datadir}/cmake/Modules/.NoDartCoverage
 %{_datadir}/cmake/Modules/*
 %{_datadir}/cmake/Templates
 %{_datadir}/cmake/include
diff --git a/disable-completness-check.patch b/disable-completness-check.patch
index 05e3c8a..2c79d8b 100644
--- a/disable-completness-check.patch
+++ b/disable-completness-check.patch
@@ -1,6 +1,6 @@
---- cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx.orig	2022-08-17 18:54:57.000000000 +0200
-+++ cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx	2022-09-27 11:07:37.195039337 +0200
-@@ -181,7 +181,7 @@ bool cmExportInstallFileGenerator::Gener
+--- cmake-3.31.7/Source/cmExportInstallCMakeConfigGenerator.cxx.orig	2025-04-10 15:13:20.000000000 +0200
++++ cmake-3.31.7/Source/cmExportInstallCMakeConfigGenerator.cxx	2025-06-12 20:14:54.901643462 +0200
+@@ -123,7 +123,7 @@ bool cmExportInstallCMakeConfigGenerator
    }
  
    this->CleanupTemporaryVariables(os);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/44074edf8d9f0d8ef3476ef704a60545655a19ac