Fix build issues

disable LTO (build fails in ctest)
Add some casts to ctest to fix curl related permissive issues

cmake-3.29.6-SHA-256.txt

@@ -1,17 +0,0 @@
-6202fac4a0a9cc6da7e7fd91599e2a25692ce648ca93115ada7adde6e13d7ce8  cmake-3.29.6-files-v1.json
-cd1e96e9337521197a7e9ca29005c6ee36dac702d31c44737122a8e42277c468  cmake-3.29.6-linux-aarch64.sh
-4d6b0a551db9da7a034a09372f716cf2094413d7fd8a787051854154b0b3b343  cmake-3.29.6-linux-aarch64.tar.gz
-6e4fada5cba3472ae503a11232b6580786802f0879cead2741672bf65d97488a  cmake-3.29.6-linux-x86_64.sh
-28fef61e64840b784da6db35218fd3ae179ff8bf0be1c8a9d075d6185a0e4fdc  cmake-3.29.6-linux-x86_64.tar.gz
-f3a618ed177ac7ef5869659bcee9a5978465ffa989ace2844bb679d1b22dae06  cmake-3.29.6-macos-universal.dmg
-c3029b29fa47747b69a1e0d3466af62b26af9ff6a5f10608a3bcdcc076810e4c  cmake-3.29.6-macos-universal.tar.gz
-cc2db7ab8213470f3c4db55a66d69bca08588ba67f9bcfa0899a4876bdd12f6d  cmake-3.29.6-macos10.10-universal.dmg
-a65f9e66c63bb79f3b6f00e4b67367b6f6c40030ee41cf06580818a74a84b3e9  cmake-3.29.6-macos10.10-universal.tar.gz
-39c355f180814b501f64a3ba1b395a467443c12bd5d5c8d9335989158fdbdbde  cmake-3.29.6-windows-arm64.msi
-8f0df498d8b1a076fc9305dde5a06427262a0476e89d4c670a49147b0bc30761  cmake-3.29.6-windows-arm64.zip
-f0e745618580fb4adb0858d9b961be272500bd80b5bce5591b0ebd8e858b3819  cmake-3.29.6-windows-i386.msi
-aca4abb4ad7eb7d97647a572132735af2bd35687826e96f7d23dd7f4d2d7d4a9  cmake-3.29.6-windows-i386.zip
-b93ec89d545c39b7bad421bcdecace9faac6483a3ce5bfa24cb948ac07adbc48  cmake-3.29.6-windows-x86_64.msi
-5c648eac06c33477e510bae14ce1f969e9abb38992b71f245633b182fccb474d  cmake-3.29.6-windows-x86_64.zip
-1391313003b83d48e2ab115a8b525a557f78d8c1544618b48d1d90184a10f0af  cmake-3.29.6.tar.gz
-79e2fc075b2aa1d93bea55b606a6a053c77c964d30319ba972046bf6cd327d11  cmake-3.29.6.zip

cmake-3.29.6-SHA-256.txt.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmZwjB4ACgkQLSzvEDSS
-FoSc6RAAnwLxcYrVtPQJUVURDShbt7JU6XjhadymMW0ThJ0sflLGe1kb6wwVvhXS
-wyu6c80gytIPfjlPX5+jWVNk1xBJjiU6VQxsHfeOHOg4Gu5JcStru3TFVsD/vXbC
-sBlnjqeP1pwsPx9RI8e5RXgRm4ydnykMVhPqY8IPOQ6kslYljVJ62ICWe/Zv4qhZ
-Z4TsPm1lYKuST6wFuMrIviJdK9CTNsX+OSbykQSrPSdACEWx1OEKYsEOb5Xzjb1Q
-vc6w18xyBy5VV20EtYy4yUYykpWuVNej9lNmDdhxWEioBWLmZLWBphgUECHc4Jto
-5GTvM7iCDkxeJ42RVq3JZKMNXy/oZK7wJPrBtQvwslaYz5Q3NbgFq3Fhp1QsLm6B
-D4p/TWnMc6Lp2rDHwk0uunewOJT8d9JI14sdEluH+BAVXa7mFzJ9bCaQLxoPinQ7
-qesXk/agRw5FTd/yQ3vqJCLyj4ONw6QTlmlemMm781p08+ngeOXw+MnwQzsGlVfO
-jOxyQvBkHl0g6ViX4IVVOqqjscbvzd3vR4HVa8bHdjssaEGiFVlV43Hk5NbNMkMe
-6SLYvuIZMunVbTuAjcHTtQL1Gpr42zA8Y/iL51+KFc8a92sWimcpq+oJf2GOUVCp
-qnySsm7wNKDUSHz9JeY8Duez2wJ9fcOgKbUSPegzvsyIdwOCcMg=
-=cyLM
------END PGP SIGNATURE-----

cmake-3.29.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1391313003b83d48e2ab115a8b525a557f78d8c1544618b48d1d90184a10f0af
-size 11248411

cmake-3.31.7-SHA-256.txt

@@ -0,0 +1,17 @@
+b410959270af66f46943bbae63cf7a3dcde68fb505ceaba4e83f01c4b47d7c28  cmake-3.31.7-files-v1.json
+ce8e32b2c1c497dd7f619124c043ac5c28a88677e390c58748dd62fe460c62a2  cmake-3.31.7-linux-aarch64.sh
+e5b2dc2aefdca10afe09c8fa4ee2bbb4e732665943a94322f99c118781910c3c  cmake-3.31.7-linux-aarch64.tar.gz
+b7a5c909cdafc36042c8c9bd5765e92ff1f2528cf01720aa6dc4df294ec7e1a0  cmake-3.31.7-linux-x86_64.sh
+14e15d0b445dbeac686acc13fe13b3135e8307f69ccf4c5c91403996ce5aa2d4  cmake-3.31.7-linux-x86_64.tar.gz
+22eea0dd50922f7e4a7e112e5606bcb3358617cdc13f512c944c81166babbd16  cmake-3.31.7-macos-universal.dmg
+1cb11aa2edae8551bb0f22807c6f5246bd0eb60ae9fa1474781eb4095d299aca  cmake-3.31.7-macos-universal.tar.gz
+531b551625920d3d5bf128ef5486987978d42d7dd682b3bed98839828c83bf15  cmake-3.31.7-macos10.10-universal.dmg
+f9f8d3e8d06ba1d12e2bda78654d00a78062550a4020917673ce30f733520edd  cmake-3.31.7-macos10.10-universal.tar.gz
+17c564185cf81548bd0164d9d9d341d5ca5c62ba24b68a5c71298ef0c92cb818  cmake-3.31.7-windows-arm64.msi
+5b72d0dcd66dadbbb90789c70789db92302342cc7b91df62059a26e230544f05  cmake-3.31.7-windows-arm64.zip
+1e0b5050c51d4b54edc533386130b847fa39600a3845a660995c77e6e816a4e0  cmake-3.31.7-windows-i386.msi
+9d545715a45efb5fada0e687ec274629c590296037f21181c30ea5c2e079277e  cmake-3.31.7-windows-i386.zip
+f75de311fc36ccdd62976a1d343939b41d5cbcd204e922bb8d0943be3d7dcc7b  cmake-3.31.7-windows-x86_64.msi
+ab1c7f46a1b1314f9fcb766c2573148679af599d94c5566bc12b8b35bb563362  cmake-3.31.7-windows-x86_64.zip
+a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68  cmake-3.31.7.tar.gz
+43638d48bc6b6c3356c247486f053f5de2dd5d838e98248e078434a03b1d3e67  cmake-3.31.7.zip

cmake-3.31.7-SHA-256.txt.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmf3zIwACgkQLSzvEDSS
+FoR2LRAAjM1okzohbKOdPIjyPjNKdAcivZ9Epgrer51ZtjATG9HeaGeRTdU0f4jR
+RrkXWO80Z/R9wkw7nM0wWJwtz284jWJI6oqNuLUPEiPc+Hfu5oVn8zEF0s+sqLwv
+FBgcp/zrz+VbPmw3HZLBvr3XmYZ57cN4fln3zT9BkC90dIcxY+e3UwutvHvtaMf4
+PcvA7MXSO5cNzP8eQbUSdxVaHIbQfV9OJoUrFNBNEmW6IQJ+hrOgGAy++DgG0ADu
+BmNkjDHR0LanLno+rr6TMb6XyZnXu99AfdRGpR8lRfkoEXDYwasHj2YlreLJRP/E
+k3Xn0p5HM6Eor68HmFT2+ZHbgRuwgyk9JiCgBIYF1zvli6xBOtkDO1XgNUB74SAa
+Pi1q7HqEfmPqbVAzG+/oBrDyop/E3VmKK6epO/leOGZFL/TjVWgPFVT6MCHk6TMv
+5pyol9vkgCmK3xo8v0I86ncMhH30CWVNTzpqOsc9mVjClLLfMJPEg5SmzUceEUHF
+sEm6ze2TtAP9lmO7SiczMHeJvVNts8YYUU/CZkgTllieXkcmsfGUuGI5Yf2Nz4K3
+EE0bVOxi08bUzGqPA3jy5J6E1h+Jpy6SfSV9pvXXsGCORFsz+mgL/8K2aP2/tp6w
+HI03A8YqAjU9ccAvgQ6UYcWORKvUgMRQzsDBPYst4yOXuED9mo4=
+=Dkjn
+-----END PGP SIGNATURE-----

cmake-findhdf5-prefer-hl-compilers.patch

@@ -0,0 +1,38 @@
+From a869b79c5921412c91fb71a761748ae5f7d3fb23 Mon Sep 17 00:00:00 2001
+From: Atri Bhattacharya <badshah400@gmail.org>
+Date: Mon, 10 Mar 2025 20:55:36 +0530
+Subject: [PATCH] FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL
+
+Prefer `h5hlcc`, `h5hlc++`, and `h5hlfc` compilers when HDF5's HL libraries
+are requested. These include the `-lhdf_hl` in the command line, whereas
+the non-hl compilers (like `h5cc`) do not. Using the latter, therefore,
+leads to cmake complaining about not finding the `HDF5_HL` libraries even
+though they are present in the same location as the `hdf5` library itself.
+
+Fixes: #23261
+---
+ Modules/FindHDF5.cmake | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
+index 2f0c3c1665..89058ca2be 100644
+--- a/Modules/FindHDF5.cmake
++++ b/Modules/FindHDF5.cmake
+@@ -218,6 +218,13 @@ else()
+   set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc)
+ endif()
+ 
++# Prefer h5hl<LANG> compilers if HDF5_FIND_HL is enabled
++if(HDF5_FIND_HL)
++  list(PREPEND HDF5_C_COMPILER_NAMES h5hlcc)
++  list(PREPEND HDF5_CXX_COMPILER_NAMES h5hlc++)
++  list(PREPEND HDF5_Fortran_COMPILER_NAMES h5hlfc)
++endif()
++
+ # Test first if the current compilers automatically wrap HDF5
+ function(_HDF5_test_regular_compiler_C success version is_parallel)
+   if(NOT ${success} OR
+-- 
+GitLab
+
+

cmake-zerojvm.patch

@@ -1,10 +0,0 @@
---- cmake-3.28.1/Modules/FindJNI.cmake	2024-02-14 13:10:42.173018608 +0100
-+++ cmake-3.28.1/Modules/FindJNI.cmake	2024-02-14 17:43:00.956527142 +0100
-@@ -344,6 +344,7 @@
-     "${dir}"
-     "${dir}/client"
-     "${dir}/server"
-+    "${dir}/zero"
-     # IBM SDK, Java Technology Edition, specific paths
-     "${dir}/j9vm"
-     "${dir}/default"

cmake.changes

@@ -1,3 +1,232 @@
+-------------------------------------------------------------------
+Wed Feb 18 02:26:33 UTC 2026 - Simon Lees <sflees@suse.de>
+
+- Fix Build for SLFO:Main
+  * Disable LTO
+  * fix-build-CURLPROXY.patch - add some casts in ctest
+
+-------------------------------------------------------------------
+Wed May 28 18:49:13 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+ 
+ - Replace usage of %jobs for reproducible builds (boo#1237231)
+ 
+-------------------------------------------------------------------
+Tue May 20 20:45:39 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix GUI build on openSUSE Leap 15.x
+
+-------------------------------------------------------------------
+Fri Apr 11 15:23:54 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 3.31.7:
+  * fix FindCUDAToolkit doesn't find CUPTI in CUDA installations
+    from runfile
+  * fix file(MAKE_DIRECTORY): creates RESULT and <variable> folders
+  * fix Wrong detection of LINKER_PUSHPOP_STATE_SUPPORTED
+  * fix cmake-gui: Invalid error message "Error: could not load cache"
+  * fix build with curl 8.13.0 (boo#1241036)
+
+-------------------------------------------------------------------
+Wed Mar 26 14:14:39 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Switch cmake-gui builds to Qt6.
+- Add BuildRequires: qt6-macro to locate qhelpgenerator (in
+  %_qt6_libexecdir) and add corresponding path to env PATH.
+- Drop use of deprecated %suse_update_desktop_file macro and
+  BuildRequires: update-desktop-files needed solely for this.
+
+-------------------------------------------------------------------
+Tue Mar 11 06:54:19 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Add cmake-findhdf5-prefer-hl-compilers.patch -- FindHDF5: Prefer
+  h5hl* compilers for HDF5_FIND_HL; patch submitted upstream
+  [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch].
+  This fixes hdf5_hl detection issues when building hdf5 >= 1.14
+  using cmake instead of autotools.
+
+-------------------------------------------------------------------
+Fri Feb 28 20:22:35 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- temporarily revert "make %cmake_{build, install} call cmake
+  directly" as the fall out is too large. will be restored once
+  fallout can be mitigated
+
+-------------------------------------------------------------------
+Tue Feb 25 06:17:14 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.6
+  * cmGeneratorExpressionDAGChecker: Construct with initializer
+    list syntax, De-duplicate constructor signature, Construct
+    with initializer list syntax
+  * GenEx: Restore evaluation context for conditional transitive
+    properties, Fix evaluation of LINK_LIBRARIES as custom
+    transitive property
+  * GoogleTest: Restore support for spaces in explicit
+    WORKING_DIRECTORY
+
+--------------------------------------------------------------------
+Wed Feb 19 00:34:48 UTC 2025 - Yoong Jin <solomoncyj@gmail.com>
+
+- make %cmake_{build, install} call cmake directly
+  to auto set generator so that %global
+  are no longer needed to set generators
+
+-------------------------------------------------------------------
+Tue Jan 14 14:33:12 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.4
+  * LFortran: Remove hard-coded --generate-object-code flag
+  * FindBoost: Add support for Boost 1.87
+
+-------------------------------------------------------------------
+Sat Dec 21 12:51:12 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.3
+  * cmLocalUnixMakefileGenerator3: Simplify progress command
+    generation
+  * Makefile: Fix per-directory codegen target
+  * Makefile: Enable progress messages for codegen target
+  * cmGlobalNinjaGenerator: Fixes and improvements
+
+-------------------------------------------------------------------
+Fri Dec  6 18:07:29 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.2
+  * GNU linker: Use single-argument form of --dependency-file flag
+  * fileapi: Do not expose flags for linker-generated dependencies
+  * LINK_OPTIONS: Fix crash on empty LINKER: prefix
+  * FindRuby: Add support for 3.4
+
+-------------------------------------------------------------------
+Tue Nov 26 20:10:59 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.1
+  * FindBoost: Add support for Boost 1.86
+  * libarchive: Update script to get 3.7.7
+  * execute_process: Restore CLOEXEC on OUTPUT_FILE and
+    ERROR_FILE descriptors
+  * LLD linker: avoid regression on archive libraries deduplication
+
+-------------------------------------------------------------------
+Thu Nov  7 17:56:10 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.31.0
+  * cmake-presets(7) files may now include comments using the key
+    "$comment" at any level within the JSON object to provide
+    documentation.
+  * The Ninja Generators and Makefile Generators now produce a
+    "codegen" build target.
+  * The "CMAKE_LINK_LIBRARIES_STRATEGY" variable and corresponding
+    "LINK_LIBRARIES_STRATEGY" target property were added to
+    optionally specify the strategy CMake uses to generate link
+    lines.
+  * The "CMAKE_EXPORT_BUILD_DATABASE" variable, a corresponding
+    "CMAKE_EXPORT_BUILD_DATABASE" environment variable, and an
+    "EXPORT_BUILD_DATABASE" target property, were added to enable
+    exporting C++ module compile commands. This is only supported
+    with Ninja Generators.
+  * The "CMAKE_<LANG>_HOST_COMPILER_ID" and
+    "CMAKE_<LANG>_HOST_COMPILER_VERSION" variables were added,
+    where "<LANG>" is either "CUDA" or "HIP".  They are populated
+    when "CMAKE_<LANG>_COMPILER_ID" is "NVIDIA" to identify NVCC's
+    host compiler.
+  * The "file(DOWNLOAD)" and "file(UPLOAD)" commands now verify TLS
+    server certificates for connections to "https://" URLs by
+    default.
+
+-------------------------------------------------------------------
+Wed Oct 23 08:36:43 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 3.30.5:
+  * project: Only check non-cache vars when setting project vars
+
+-------------------------------------------------------------------
+Fri Sep 27 22:19:53 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.30.4:
+  * FetchContent: Don't update verify script timestamp if it
+    doesn't change
+  * project: Only define non-cache vars if already defined
+  * librhash: aligned_alloc is not available with glibc < 2.16
+  * FindPython: ensure all ABI are searched by default
+  * FindMatlab: multiple fixes for MCR
+
+-------------------------------------------------------------------
+Fri Aug 30 05:02:09 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.30.3:
+  * file(DOWNLOAD): Fix User-Agent to use run-time curl version
+  * curl: Avoid using HTTP/2 with curl 8.7.x due to bug in error
+    codes
+  * FindPython: fix regression of NumPy detection with Intel MKL
+    library
+  * FindPython: ensure a usable environment is set for the free
+    threaded Python
+  * project: non cache <project> prefix variables are created
+  * FindJNI: Support finding libjvm.so for all OpenJDK variants
+- Remove cmake-zerojvm.patch which is part of upstream
+
+-------------------------------------------------------------------
+Sat Aug  3 07:23:10 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 3.30.2:
+  * Swift: Fix INSTALL_NAME_DIR under CMP0157 NEW behavior
+  * ExternalProject: Don't add SVN auth args if not set
+  * bug fixes, developer visible fixes and updates to tests
+- drop curl-8.9.0-output.patch
+
+-------------------------------------------------------------------
+Sat Jul 27 05:49:03 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- Add curl-8.9.0-output.patch to fix test for different output
+  with cURL 8.9.0. Part of upstream and will be part of 3.31.0.
+
+-------------------------------------------------------------------
+Fri Jul 19 16:27:30 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- update to 3.30.1
+  * Tests: Fix RunCMake.ExternalProject when git is not available
+  + Restore support for exporting INTERFACE with missing
+    dependencies
+  * FindMatlab: Restore support for finding Matlab without any
+    languages
+  * libuv: backport IDNA input/output hardening fixes
+  * IntelLLVM: Update toolchain layout for 2024+ versions
+  * Evaluation of TRANSITIVE_LINK_PROPERTIES isn't considered a usage
+- Drop cmake-fix-test-without-git.patch which is part of 3.30.1
+
+-------------------------------------------------------------------
+Wed Jul  3 05:50:53 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- udate to 3.30.0
+  * "cmake-presets(7)" files now support schema version "9".
+    "include"  fields now expand all macros except "$env{}" and
+    preset-specific macros, i.e., those derived from the fields
+    inside a preset's definition.
+  * The "Compile Features" functionality now implements support
+    for the "cxx_std_26" and "cuda_std_26" meta-features to
+    indicate that the compiler mode must be at least C++26.
+  * The "CMAKE_<LANG>_STANDARD_LATEST" variable was added to
+    describe the latest "<LANG>" language standard CMake supports
+    for the selected compiler.
+  * The "CMAKE_TLS_VERSION" variable and "CMAKE_TLS_VERSION"
+    environment variable were added to specify a default minimum
+    TLS version for connections to "https://" URLs by the
+    "file(DOWNLOAD)" and "file(UPLOAD)" commands.
+  * The "GENERATED" source file property is now visible in all
+    directories.  See policy "CMP0163".  Policy "CMP0118"'s
+    documentation has been revised to describe its actual effects.
+  * The "TARGET_PROPERTY" generator expression learned to evaluate
+    custom transitive properties.
+  * The "CPack WIX Generator" gained support for WiX Toolset v4.
+    See the "CPACK_WIX_VERSION" variable.
+  * The "FindBoost" module has been removed by policy "CMP0167".
+    Port projects to upstream Boost's "BoostConfig.cmake" package
+    configuration file, for which "find_package(Boost)" now
+    searches.
+- Add cmake-fix-test-without-git.patch to fix test #567 to be run
+  conditionally when Git is found, upstream planned for 3.30.1
+
 -------------------------------------------------------------------
 Wed Jun 19 07:56:40 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

cmake.macros

@@ -77,6 +77,6 @@
     DESTDIR=%{buildroot} %__builder install -C %__builddir
 
 %ctest(:-:) \
-    cd %__builddir \
-    %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \
+    cd %__builddir && \
+    %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** ; \
     cd ..

cmake.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package cmake
 #
-# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+# cmake doesn't build with lto on all platforms
+%define _lto_cflags %{nil}
 
 %global flavor @BUILD_FLAVOR@%{nil}
 # Flavor gui
@@ -45,14 +47,14 @@
 %else
 %bcond_with full
 %endif
-%define shortversion 3.29
+%define shortversion 3.31
 %if 0%{?suse_version} && 0%{?suse_version} <= 1500
 %define pyver 311
 %else
 %define pyver 3
 %endif
 Name:           cmake%{?psuffix}
-Version:        3.29.6
+Version:        3.31.7
 Release:        0
 Summary:        Cross-platform make system
 License:        BSD-3-Clause
@@ -69,7 +71,9 @@ Source99:       README.SUSE
 Patch0:         cmake-fix-ruby-test.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch1:         feature-suse-python-interp-search-order.patch
-Patch2:         cmake-zerojvm.patch
+# PATCH-FIX-UPSTREAM cmake-findhdf5-prefer-hl-compilers.patch badshah400@gmail.com -- FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL; patch submitted upstream [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch]
+Patch2:         cmake-findhdf5-prefer-hl-compilers.patch
+Patch3:         fix-build-CURLPROXY.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -108,11 +112,17 @@ BuildRequires:  pkgconfig(libcurl)
 %if %{with gui}
 BuildRequires:  python%{pyver}-Sphinx
 BuildRequires:  python%{pyver}-base
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  qt6-macros
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Widgets)
+%if 0%{?suse_version} < 1600
+# for #include <filesystem>
+BuildRequires:  gcc12-c++
+%endif
 %endif
 %if %{with qhelp}
-BuildRequires:  libqt5-qttools-qhelpgenerator
+BuildRequires:  qt6-tools-helpgenerators
 %endif
 
 %description
@@ -147,13 +157,23 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOURC
 
 %build
 cp -p %{SOURCE99} .
+%if %{with qhelp}
+# Add path to qhelpgenerator
+export PATH+=":%{_qt6_libexecdir}"
+%endif
 %if %{with mini}
 # this is serial, so it takes too much time for the mini package
 %define _find_debuginfo_dwz_opts %{nil}
 %define _lto_cflags %{nil}
 %endif
+# -Wno-fpermissive required for system curl in ctest
 export CFLAGS="%{optflags}"
 export CXXFLAGS="$CFLAGS"
+%if %{with gui}
+%if 0%{?suse_version} < 1600
+export CXX=g++-12
+%endif
+%endif
 %if "%{flavor}" != ""
 # This is not autotools configure
 ./configure \
@@ -169,7 +189,11 @@ export CXXFLAGS="$CFLAGS"
     --no-system-jsoncpp \
     --no-system-libarchive \
 %endif
-    --parallel=0%{jobs} \
+%if 0%{?suse_version} < 1600
+     --parallel=0%{jobs} \
+%else
+    --parallel=${RPM_BUILD_NCPUS:-1} \
+%endif
     --verbose \
 %if 0%{?suse_version} > 1500
     --system-libuv \
@@ -195,7 +219,6 @@ export CXXFLAGS="$CFLAGS"
 mkdir -p %{buildroot}%{_libdir}/cmake
 
 %if %{with gui}
-%suse_update_desktop_file  -r cmake-gui CMake Development IDE Tools Qt
 
 # delete files that belong to the 'cmake' package
 rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest,ccmake}

fix-build-CURLPROXY.patch

@@ -0,0 +1,28 @@
+Index: cmake-3.31.7/Source/CTest/cmCTestCurl.cxx
+===================================================================
+--- cmake-3.31.7.orig/Source/CTest/cmCTestCurl.cxx
++++ cmake-3.31.7/Source/CTest/cmCTestCurl.cxx
+@@ -264,7 +264,7 @@ void cmCTestCurl::SetProxyType()
+ {
+   this->HTTPProxy.clear();
+   // this is the default
+-  this->HTTPProxyType = CURLPROXY_HTTP;
++  this->HTTPProxyType = (curl_proxytype)CURLPROXY_HTTP;
+   this->HTTPProxyAuth.clear();
+   if (cmSystemTools::GetEnv("HTTP_PROXY", this->HTTPProxy)) {
+     std::string port;
+@@ -276,11 +276,11 @@ void cmCTestCurl::SetProxyType()
+     if (cmSystemTools::GetEnv("HTTP_PROXY_TYPE", type)) {
+       // HTTP/SOCKS4/SOCKS5
+       if (type == "HTTP") {
+-        this->HTTPProxyType = CURLPROXY_HTTP;
++        this->HTTPProxyType = (curl_proxytype)CURLPROXY_HTTP;
+       } else if (type == "SOCKS4") {
+-        this->HTTPProxyType = CURLPROXY_SOCKS4;
++        this->HTTPProxyType = (curl_proxytype)CURLPROXY_SOCKS4;
+       } else if (type == "SOCKS5") {
+-        this->HTTPProxyType = CURLPROXY_SOCKS5;
++        this->HTTPProxyType = (curl_proxytype)CURLPROXY_SOCKS5;
+       }
+     }
+     cmSystemTools::GetEnv("HTTP_PROXY_USER", this->HTTPProxyAuth);