Accepting request 1283475 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1283475
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=268

cmake-3.30.3-SHA-256.txt

@@ -1,17 +0,0 @@
-408aa6889fc25fea8c5280065f4eeac3e330d66bae2a212630cf4353f886c781  cmake-3.30.3-files-v1.json
-43d5882e5db6d4331d3097d3a4ff92e53cd19987e7da9ffa6c833d22f9ca7aaa  cmake-3.30.3-linux-aarch64.sh
-420f17c58de4ed8b53c1055a34318aec5c06d94b04dac9dd3c72861dfdc99d52  cmake-3.30.3-linux-aarch64.tar.gz
-54f93e25d728b742f9ffb51d7093b883ee4332d9923b427e39f8f46fb74d6e68  cmake-3.30.3-linux-x86_64.sh
-4a5864e9ff0d7945731fe6d14afb61490bf0ec154527bc3af0456bd8fa90decb  cmake-3.30.3-linux-x86_64.tar.gz
-f5aabecc73d9d373d298ca1f13798f36b4cc96932cc86ea4e3833442508bb99d  cmake-3.30.3-macos-universal.dmg
-cec873b2822f1c34bc3e2fd6ec9fdd1c4c6bc850edfeba47524f23cdfeb1c8c4  cmake-3.30.3-macos-universal.tar.gz
-9c967b068be1744910a1f604f2cc78d5b0a67a8609baf3fc3dbadf92f8c2b3e4  cmake-3.30.3-macos10.10-universal.dmg
-8ebca4b3cea5c7f39f5bff8ad1ca9b7e8267d758375955f8f14f385d6827fc2e  cmake-3.30.3-macos10.10-universal.tar.gz
-b6061598d6bd10089b07db3f0cce1a36202ec28fe1b0a4564f1c4535c8edba3c  cmake-3.30.3-windows-arm64.msi
-8b35d500f6c33383385990405e4a3d307c570e5a0043eab9b781422b078637de  cmake-3.30.3-windows-arm64.zip
-f7e05fb104fed42db7581a8dc25ecddfa432d8d3595d3ed9e8c9386837416c30  cmake-3.30.3-windows-i386.msi
-5e4464a6d5af15e1a45fa376ac03b6bd63b35b7d93a2e93a2dd6215b39513a3f  cmake-3.30.3-windows-i386.zip
-097900d46f393432a518f91e0145410e99b2fb7dc2a8e807aeafeeaefd40e080  cmake-3.30.3-windows-x86_64.msi
-2b339f738d3dea408d1523c99bb24d2d82b169f5749a698225ecfdf2f0d1c314  cmake-3.30.3-windows-x86_64.zip
-6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4  cmake-3.30.3.tar.gz
-64dedbc7bd0433c072371bca0b03fd9f0a7d2b559c98816a7967197417780e8e  cmake-3.30.3.zip

cmake-3.30.3-SHA-256.txt.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmbQ1eoACgkQLSzvEDSS
-FoTD3xAAmxkdm6M1K78LpyamxREi7yIu+g/OAhh6KzBRbEr3LdaugS17Emx+QBE+
-T4XOgzjv1fnDn1Tv/90Mk1onQi+gCoLO+uCLzBJ6Tag2esCzJRrwL47KGwIJYO5L
-qFvxPU8SGK3cLzeQSuTSka07mUf9lXMoVj8TSIRc3/ZqrIHLK5MHQmVVUoi5y50T
-DgHzPz3nrge8O8Rmrs7UPfiDYmWkOWdGlErDdiSlIBwLUPeGMZQl7W5TM3HoALTG
-NEZwjhlgTDt3lRkQsYvCQdd/N4NMUlbCyW/IrIuhaXmhGoYYxUGBky4zSOg0koYw
-mQB6pmL7WVElMCPUnBdxjeyK4wL83gb/l2dXL4EQ0pJH/oKUQrQPSnO/DWhfBMqv
-jw6z9dzgBDr1K02A01zx6FLwJl9Bmu22SBQSYk42Pc8Y3v/05blX7MudPumfNaYh
-AAjMJ9TBQI+gqfIlvSWRHaR71KnCm2new9fCt3GA1XP4P5ChujtjL7vVzBIXFkVt
-MGZCp+z44DDfoUViRWp37FSFInFqn9wz89/Mxmp2oW9A29w4GOob8XuIt0prWwds
-T8E0NLcLcZC4zJfhVtZfQC52uEDVpaSOgbzODC+3bovtrgW/lM22fdksNPCxF8Oy
-XQUwGDKJHHy2uxc8Jludy3ss1PSwpk3cu5Yiuto5uTrmZYUtA4Y=
-=uwIX
------END PGP SIGNATURE-----

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.changes

@@ -1,3 +1,149 @@
+-------------------------------------------------------------------
+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>
 

cmake.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package cmake
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
+# 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
@@ -45,14 +45,14 @@
 %else
 %bcond_with full
 %endif
-%define shortversion 3.30
+%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.30.3
+Version:        3.31.7
 Release:        0
 Summary:        Cross-platform make system
 License:        BSD-3-Clause
@@ -69,6 +69,8 @@ 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
+# 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
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -107,11 +109,17 @@ BuildRequires:  pkgconfig(libcurl)
 %if %{with gui}
 BuildRequires:  python%{pyver}-Sphinx
 BuildRequires:  python%{pyver}-base
-BuildRequires:  update-desktop-files
+BuildRequires:  qt6-macros
-BuildRequires:  pkgconfig(Qt5Widgets)
+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
@@ -146,6 +154,10 @@ 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}
@@ -153,6 +165,11 @@ cp -p %{SOURCE99} .
 %endif
 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 \
@@ -168,7 +185,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 \
@@ -194,7 +215,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}