From 8d718f4ee491cce014ab0ce361de87446e8e26c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:41:26 +0000 Subject: [PATCH 01/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index ae22406..c10e001 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.10.5 -Release: 1%{?dist} +Release: 2%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -389,6 +389,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.10.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 03 2022 Sandro Mani - 4.10.5-1 - Update to 4.10.5 From abc989a3a7dc369f431458348d2f46ee0332d458 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 8 Nov 2022 19:32:59 +0100 Subject: [PATCH 02/46] Update to 4.11.0 --- .gitignore | 1 + fedoratarball.sh | 5 ----- gmsh.spec | 17 +++++++++++------ gmsh_build.patch | 6 +++--- gmsh_install.patch | 8 ++++---- gmsh_julia.patch | 12 ++++++------ gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 20 ++++++++++++-------- gmsh_unbundle_gl2ps.patch | 14 +++++++------- sources | 2 +- 10 files changed, 57 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index d7a8030..e467d98 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /gmsh-4.10.3-source-fedora.tar.xz /gmsh-4.10.4-source-fedora.tar.xz /gmsh-4.10.5-source-fedora.tar.xz +/gmsh-4.11.0-source-fedora.tar.xz diff --git a/fedoratarball.sh b/fedoratarball.sh index d6f9d5a..b42d209 100755 --- a/fedoratarball.sh +++ b/fedoratarball.sh @@ -1,10 +1,5 @@ #!/bin/sh -#if [ $# -lt 1 ]; then -# echo "Usage: $0 upstream_ver" -# exit 1 -#fi - ver=`grep Version: gmsh.spec | awk -F " " '{print $2}'` echo "This will download and rearchive gmsh version $ver" diff --git a/gmsh.spec b/gmsh.spec index c10e001..45faf7a 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -1,7 +1,7 @@ %bcond_without openmpi %bcond_without mpich -%global sover 4.10 +%global sover 4.11 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_without flexiblas @@ -9,8 +9,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.10.5 -Release: 2%{?dist} +Version: 4.11.0 +Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -336,6 +336,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %doc %{_defaultdocdir}/%{name}/tutorials %doc %{_defaultdocdir}/%{name}/examples %doc %{_defaultdocdir}/%{name}/%{name}.html +%doc %{_defaultdocdir}/%{name}/images/ %files %{_bindir}/%{name} @@ -343,8 +344,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files devel %{_includedir}/gmsh.h %{_includedir}/gmshc.h -%{_includedir}/gmshf.h %{_includedir}/gmsh.h_cwrap +%{_includedir}/gmsh.f90 %{_libdir}/libgmsh.so %files libs @@ -354,6 +355,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files -n python3-%{name} %{python3_sitelib}/gmsh.py %{python3_sitelib}/__pycache__/gmsh.*.pyc +%{python3_sitelib}/gmsh-%{version}*.dist-info/ %if %{with openmpi} %files openmpi @@ -362,8 +364,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files openmpi-devel %{_includedir}/openmpi*/gmsh.h %{_includedir}/openmpi*/gmshc.h -%{_includedir}/openmpi*/gmshf.h %{_includedir}/openmpi*/gmsh.h_cwrap +%{_includedir}/openmpi*/gmsh.f90 %{_libdir}/openmpi/lib/libgmsh.so %files openmpi-libs @@ -378,8 +380,8 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files mpich-devel %{_includedir}/mpich*/gmsh.h %{_includedir}/mpich*/gmshc.h -%{_includedir}/mpich*/gmshf.h %{_includedir}/mpich*/gmsh.h_cwrap +%{_includedir}/mpich*/gmsh.f90 %{_libdir}/mpich/lib/libgmsh.so %files mpich-libs @@ -389,6 +391,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Nov 08 2022 Sandro Mani - 4.11.0-1 +- Update to 4.11.0 + * Thu Jul 21 2022 Fedora Release Engineering - 4.10.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/gmsh_build.patch b/gmsh_build.patch index 83f851f..7435541 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.10.5-source/src/fltk/helpWindow.cpp 2022-07-03 18:30:12.102025772 +0200 -+++ gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp 2022-07-03 18:30:12.546025782 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/fltk/helpWindow.cpp gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.11.0-source/src/fltk/helpWindow.cpp 2022-11-08 18:35:37.046147916 +0100 ++++ gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp 2022-11-08 18:35:37.590147919 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index 8fe3e2c..6a391b1 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt ---- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:12.326025777 +0200 -+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.330025777 +0200 -@@ -270,7 +270,7 @@ if(ENABLE_RPATH) +diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt +--- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:37.333147917 +0100 ++++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.337147918 +0100 +@@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 7102232..5fdbdd7 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,12 +1,12 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt ---- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:11.875025767 +0200 -+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.106025772 +0200 -@@ -1898,7 +1898,7 @@ endif() +diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt +--- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:36.767147915 +0100 ++++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.052147916 +0100 +@@ -1919,7 +1919,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) - install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB}) + install(FILES ${GMSH_JL} DESTINATION share/gmsh) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/METADATA DESTINATION + ${PYTHON3_SITE_PACKAGES}/gmsh-${GMSH_PYTHON_VERSION}.dist-info) if(ENABLE_PRIVATE_API) - install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) - if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen diff --git a/gmsh_med.patch b/gmsh_med.patch index b9241c4..e73b6ee 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/src/common/CommandLine.cpp gmsh-4.10.5-source-new/src/common/CommandLine.cpp ---- gmsh-4.10.5-source/src/common/CommandLine.cpp 2022-04-26 17:50:41.000000000 +0200 -+++ gmsh-4.10.5-source-new/src/common/CommandLine.cpp 2022-07-03 18:30:11.880025767 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/common/CommandLine.cpp gmsh-4.11.0-source-new/src/common/CommandLine.cpp +--- gmsh-4.11.0-source/src/common/CommandLine.cpp 2022-09-28 20:00:58.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/common/CommandLine.cpp 2022-11-08 18:35:36.772147915 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.10.5-source/src/fltk/helpWindow.cpp 2022-01-11 20:34:46.000000000 +0100 -+++ gmsh-4.10.5-source-new/src/fltk/helpWindow.cpp 2022-07-03 18:30:11.880025767 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/fltk/helpWindow.cpp gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.11.0-source/src/fltk/helpWindow.cpp 2022-09-28 20:00:58.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp 2022-11-08 18:35:36.772147915 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/fltk/helpWindow.cpp gmsh-4.10 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp gmsh-4.10.5-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp 2022-01-11 20:34:47.000000000 +0100 -+++ gmsh-4.10.5-source-new/src/geo/GModelIO_MED.cpp 2022-07-03 18:30:11.881025767 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/geo/GModelIO_MED.cpp gmsh-4.11.0-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.11.0-source/src/geo/GModelIO_MED.cpp 2022-10-19 11:45:57.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/geo/GModelIO_MED.cpp 2022-11-08 18:35:36.772147915 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.10.5-source/src/post/PViewDataGModelIO.cpp gmsh-4.10.5-source-new/src/post/PViewDataGModelIO.cpp ---- gmsh-4.10.5-source/src/post/PViewDataGModelIO.cpp 2022-01-11 20:34:48.000000000 +0100 -+++ gmsh-4.10.5-source-new/src/post/PViewDataGModelIO.cpp 2022-07-03 18:30:11.881025767 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/post/PViewDataGModelIO.cpp gmsh-4.11.0-source-new/src/post/PViewDataGModelIO.cpp +--- gmsh-4.11.0-source/src/post/PViewDataGModelIO.cpp 2022-09-28 20:01:01.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/post/PViewDataGModelIO.cpp 2022-11-08 18:35:36.773147915 +0100 @@ -542,7 +542,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 6a14765..f6c8c7c 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt ---- gmsh-4.10.5-source/CMakeLists.txt 2022-07-01 09:37:10.000000000 +0200 -+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:11.655025762 +0200 -@@ -1880,6 +1880,8 @@ else() +diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt +--- gmsh-4.11.0-source/CMakeLists.txt 2022-10-31 21:39:09.000000000 +0100 ++++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:36.490147914 +0100 +@@ -1901,6 +1901,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source # mark targets as optional so we can install them separately if needed # (e.g. "make lib" or "make shared" followed by "make install/fast") install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) -@@ -1891,11 +1893,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1912,14 +1914,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) @@ -22,11 +22,15 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source - install(FILES ${GMSH_PY} DESTINATION ${GMSH_LIB}) + install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/METADATA DESTINATION +- ${GMSH_LIB}/gmsh-${GMSH_PYTHON_VERSION}.dist-info) ++ ${PYTHON3_SITE_PACKAGES}/gmsh-${GMSH_PYTHON_VERSION}.dist-info) if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) -diff -rupN --no-dereference gmsh-4.10.5-source/src/common/GmshMessage.cpp gmsh-4.10.5-source-new/src/common/GmshMessage.cpp ---- gmsh-4.10.5-source/src/common/GmshMessage.cpp 2022-04-26 17:50:41.000000000 +0200 -+++ gmsh-4.10.5-source-new/src/common/GmshMessage.cpp 2022-07-03 18:30:11.655025762 +0200 + if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen +diff -rupN --no-dereference gmsh-4.11.0-source/src/common/GmshMessage.cpp gmsh-4.11.0-source-new/src/common/GmshMessage.cpp +--- gmsh-4.11.0-source/src/common/GmshMessage.cpp 2022-09-28 20:00:58.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/common/GmshMessage.cpp 2022-11-08 18:35:36.489147913 +0100 @@ -169,14 +169,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 6beb9d1..bf83599 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source-new/CMakeLists.txt ---- gmsh-4.10.5-source/CMakeLists.txt 2022-07-03 18:30:12.543025782 +0200 -+++ gmsh-4.10.5-source-new/CMakeLists.txt 2022-07-03 18:30:12.758025787 +0200 -@@ -1624,6 +1624,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB +diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt +--- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:37.586147919 +0100 ++++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.837147920 +0100 +@@ -1643,6 +1643,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.10.5-source/CMakeLists.txt gmsh-4.10.5-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.10.5-source/src/graphics/CMakeLists.txt gmsh-4.10.5-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.10.5-source/src/graphics/CMakeLists.txt 2022-01-11 20:34:47.000000000 +0100 -+++ gmsh-4.10.5-source-new/src/graphics/CMakeLists.txt 2022-07-03 18:30:12.758025787 +0200 +diff -rupN --no-dereference gmsh-4.11.0-source/src/graphics/CMakeLists.txt gmsh-4.11.0-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.11.0-source/src/graphics/CMakeLists.txt 2022-09-28 20:00:59.000000000 +0200 ++++ gmsh-4.11.0-source-new/src/graphics/CMakeLists.txt 2022-11-08 18:35:37.837147920 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index bbad294..3768bce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.10.5-source-fedora.tar.xz) = 34ae13ba8f629fd64974f98bf9a28ca3decb48b8035adfd1d3dcf2f22cfc4f11ebdf726f323ce9cccdf587917cd3994f0d02196b50e9c98e2c220d09c7d17d50 +SHA512 (gmsh-4.11.0-source-fedora.tar.xz) = 6039d2710ed27fd82f6e2d94b31db6a01e493bcadca3a1c6309cd82055d04b13331a98efd58990784cef27f866f1b7126db17793bb117c966d38df6e03b7ab21 From a63b3c42deabd83253fd38b68f31513a3aa6bb7e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 21 Dec 2022 15:36:19 +0100 Subject: [PATCH 03/46] Update to 4.11.1 --- .gitignore | 1 + gmsh.spec | 5 ++++- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 8 ++++---- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 18 +++++++++--------- gmsh_unbundle_gl2ps.patch | 14 +++++++------- sources | 2 +- 9 files changed, 44 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index e467d98..de04ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /gmsh-4.10.4-source-fedora.tar.xz /gmsh-4.10.5-source-fedora.tar.xz /gmsh-4.11.0-source-fedora.tar.xz +/gmsh-4.11.1-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index 45faf7a..52725f9 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -9,7 +9,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.11.0 +Version: 4.11.1 Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt @@ -391,6 +391,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed Dec 21 2022 Sandro Mani - 4.11.1-1 +- Update to 4.11.1 + * Tue Nov 08 2022 Sandro Mani - 4.11.0-1 - Update to 4.11.0 diff --git a/gmsh_build.patch b/gmsh_build.patch index 7435541..599bcae 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/src/fltk/helpWindow.cpp gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.11.0-source/src/fltk/helpWindow.cpp 2022-11-08 18:35:37.046147916 +0100 -+++ gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp 2022-11-08 18:35:37.590147919 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/fltk/helpWindow.cpp gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.11.1-source/src/fltk/helpWindow.cpp 2022-12-21 15:34:04.580442044 +0100 ++++ gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp 2022-12-21 15:34:05.148442057 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index 6a391b1..d951bfe 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt ---- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:37.333147917 +0100 -+++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.337147918 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt +--- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:04.867442050 +0100 ++++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.872442050 +0100 @@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 5fdbdd7..91e6289 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt ---- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:36.767147915 +0100 -+++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.052147916 +0100 -@@ -1919,7 +1919,7 @@ endif() +diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt +--- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:04.301442038 +0100 ++++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.586442044 +0100 +@@ -1933,7 +1933,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) diff --git a/gmsh_med.patch b/gmsh_med.patch index e73b6ee..bf20da7 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/src/common/CommandLine.cpp gmsh-4.11.0-source-new/src/common/CommandLine.cpp ---- gmsh-4.11.0-source/src/common/CommandLine.cpp 2022-09-28 20:00:58.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/common/CommandLine.cpp 2022-11-08 18:35:36.772147915 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/common/CommandLine.cpp gmsh-4.11.1-source-new/src/common/CommandLine.cpp +--- gmsh-4.11.1-source/src/common/CommandLine.cpp 2022-09-28 20:00:58.000000000 +0200 ++++ gmsh-4.11.1-source-new/src/common/CommandLine.cpp 2022-12-21 15:34:04.306442038 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.11.0-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.11.0-source/src/fltk/helpWindow.cpp gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.11.0-source/src/fltk/helpWindow.cpp 2022-09-28 20:00:58.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/fltk/helpWindow.cpp 2022-11-08 18:35:36.772147915 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/fltk/helpWindow.cpp gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.11.1-source/src/fltk/helpWindow.cpp 2022-09-28 20:00:58.000000000 +0200 ++++ gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp 2022-12-21 15:34:04.306442038 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.11.0-source/src/fltk/helpWindow.cpp gmsh-4.11 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.11.0-source/src/geo/GModelIO_MED.cpp gmsh-4.11.0-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.11.0-source/src/geo/GModelIO_MED.cpp 2022-10-19 11:45:57.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/geo/GModelIO_MED.cpp 2022-11-08 18:35:36.772147915 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/geo/GModelIO_MED.cpp gmsh-4.11.1-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.11.1-source/src/geo/GModelIO_MED.cpp 2022-10-19 11:45:57.000000000 +0200 ++++ gmsh-4.11.1-source-new/src/geo/GModelIO_MED.cpp 2022-12-21 15:34:04.307442038 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.11.0-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.11.0-source/src/post/PViewDataGModelIO.cpp gmsh-4.11.0-source-new/src/post/PViewDataGModelIO.cpp ---- gmsh-4.11.0-source/src/post/PViewDataGModelIO.cpp 2022-09-28 20:01:01.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/post/PViewDataGModelIO.cpp 2022-11-08 18:35:36.773147915 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/post/PViewDataGModelIO.cpp gmsh-4.11.1-source-new/src/post/PViewDataGModelIO.cpp +--- gmsh-4.11.1-source/src/post/PViewDataGModelIO.cpp 2022-09-28 20:01:01.000000000 +0200 ++++ gmsh-4.11.1-source-new/src/post/PViewDataGModelIO.cpp 2022-12-21 15:34:04.307442038 +0100 @@ -542,7 +542,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index f6c8c7c..d8fb69d 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt ---- gmsh-4.11.0-source/CMakeLists.txt 2022-10-31 21:39:09.000000000 +0100 -+++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:36.490147914 +0100 -@@ -1901,6 +1901,8 @@ else() +diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt +--- gmsh-4.11.1-source/CMakeLists.txt 2022-12-20 16:30:55.000000000 +0100 ++++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.007442031 +0100 +@@ -1915,6 +1915,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source # mark targets as optional so we can install them separately if needed # (e.g. "make lib" or "make shared" followed by "make install/fast") install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) -@@ -1912,14 +1914,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1926,14 +1928,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) @@ -28,10 +28,10 @@ diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.11.0-source/src/common/GmshMessage.cpp gmsh-4.11.0-source-new/src/common/GmshMessage.cpp ---- gmsh-4.11.0-source/src/common/GmshMessage.cpp 2022-09-28 20:00:58.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/common/GmshMessage.cpp 2022-11-08 18:35:36.489147913 +0100 -@@ -169,14 +169,6 @@ void Msg::Initialize(int argc, char **ar +diff -rupN --no-dereference gmsh-4.11.1-source/src/common/GmshMessage.cpp gmsh-4.11.1-source-new/src/common/GmshMessage.cpp +--- gmsh-4.11.1-source/src/common/GmshMessage.cpp 2022-11-29 17:08:32.000000000 +0100 ++++ gmsh-4.11.1-source-new/src/common/GmshMessage.cpp 2022-12-21 15:34:04.007442031 +0100 +@@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index bf83599..ea2c41c 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source-new/CMakeLists.txt ---- gmsh-4.11.0-source/CMakeLists.txt 2022-11-08 18:35:37.586147919 +0100 -+++ gmsh-4.11.0-source-new/CMakeLists.txt 2022-11-08 18:35:37.837147920 +0100 -@@ -1643,6 +1643,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB +diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt +--- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:05.142442056 +0100 ++++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:05.425442063 +0100 +@@ -1645,6 +1645,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.11.0-source/CMakeLists.txt gmsh-4.11.0-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.11.0-source/src/graphics/CMakeLists.txt gmsh-4.11.0-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.11.0-source/src/graphics/CMakeLists.txt 2022-09-28 20:00:59.000000000 +0200 -+++ gmsh-4.11.0-source-new/src/graphics/CMakeLists.txt 2022-11-08 18:35:37.837147920 +0100 +diff -rupN --no-dereference gmsh-4.11.1-source/src/graphics/CMakeLists.txt gmsh-4.11.1-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.11.1-source/src/graphics/CMakeLists.txt 2022-09-28 20:00:59.000000000 +0200 ++++ gmsh-4.11.1-source-new/src/graphics/CMakeLists.txt 2022-12-21 15:34:05.425442063 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 3768bce..8155934 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.11.0-source-fedora.tar.xz) = 6039d2710ed27fd82f6e2d94b31db6a01e493bcadca3a1c6309cd82055d04b13331a98efd58990784cef27f866f1b7126db17793bb117c966d38df6e03b7ab21 +SHA512 (gmsh-4.11.1-source-fedora.tar.xz) = f0f2cdf4352267de2dca47e166531fb591029522270e7b21a23706f595698dbc45046429fc613a84b60e440a0a73520b3c5f2c0c745c175ebc884b7c148039bd From 87defd074fa636ea0ac8de402df47db0617162a6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 13 Jan 2023 21:14:42 -0600 Subject: [PATCH 04/46] Rebuild for opencascade. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 52725f9..b28fdc1 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 1%{?dist} +Release: 2%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -391,6 +391,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sat Jan 14 2023 Richard Shaw - 4.11.1-2 +- Rebuild for opencascade. + * Wed Dec 21 2022 Sandro Mani - 4.11.1-1 - Update to 4.11.1 From 31dc8e099313b8e9acab6ff7106cfdbe0abc672d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:19:50 +0000 Subject: [PATCH 05/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index b28fdc1..6092529 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 2%{?dist} +Release: 3%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -391,6 +391,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jan 14 2023 Richard Shaw - 4.11.1-2 - Rebuild for opencascade. From ca104a2d3b1b4f226200eb317e88e6ecbfa97b26 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 23 Jan 2023 21:58:36 -0600 Subject: [PATCH 06/46] Add header patch for GCC 13. --- gmsh-cstdint.patch | 12 ++++++++++++ gmsh.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 gmsh-cstdint.patch diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch new file mode 100644 index 0000000..8422d30 --- /dev/null +++ b/gmsh-cstdint.patch @@ -0,0 +1,12 @@ +Index: gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp +=================================================================== +--- gmsh-4.11.1-source.orig/src/mesh/meshGFacePack.cpp ++++ gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/gmsh.spec b/gmsh.spec index 6092529..4c09f21 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -33,6 +33,8 @@ Patch3: gmsh_install.patch Patch4: gmsh_build.patch # Unbundle gl2ps Patch5: gmsh_unbundle_gl2ps.patch +# Header fix for GCC 13 +Patch6: gmsh-cstdint.patch BuildRequires: alglib-devel BuildRequires: ann-devel From 0b64c4100dd64ede611ad4782a044dc26668f8cb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 17 Jun 2023 11:44:09 +0200 Subject: [PATCH 07/46] Rebuilt for Python 3.12 --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 4c09f21..de356e7 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 3%{?dist} +Release: 4%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -393,6 +393,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sat Jun 17 2023 Python Maint - 4.11.1-4 +- Rebuilt for Python 3.12 + * Thu Jan 19 2023 Fedora Release Engineering - 4.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a2396aece5f77ea3c05d3fea0a7eaf41b6e549fa Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jul 2023 15:43:04 +0200 Subject: [PATCH 08/46] Rebuild (cgnslib) --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index de356e7..22b92be 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 4%{?dist} +Release: 5%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -393,6 +393,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jul 06 2023 Sandro Mani - 4.11.1-5 +- Rebuild (cgnslib) + * Sat Jun 17 2023 Python Maint - 4.11.1-4 - Rebuilt for Python 3.12 From b6d7ec695a1916240b0297bab293a7558d6aa871 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:27:35 +0000 Subject: [PATCH 09/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 22b92be..9f5d2da 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -10,7 +10,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 5%{?dist} +Release: 6%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -393,6 +393,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Sandro Mani - 4.11.1-5 - Rebuild (cgnslib) From 8c2b851ce96866b5414f766f6b2ee4b80ff4dbdc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 29 Oct 2023 14:52:53 -0600 Subject: [PATCH 10/46] Rebuild for openmpi 5.0.0, drops i686 and C++ API --- gmsh.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 9f5d2da..ab75d23 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -1,4 +1,12 @@ +%if 0%{?fedora} >= 40 +%ifarch %{ix86} +%bcond_with openmpi +%else %bcond_without openmpi +%endif +%else +%bcond_without openmpi +%endif %bcond_without mpich %global sover 4.11 @@ -10,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.11.1 -Release: 6%{?dist} +Release: 7%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -393,6 +401,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sun Oct 29 2023 Orion Poplawski - 4.11.1-7 +- Rebuild for openmpi 5.0.0, drops i686 and C++ API + * Wed Jul 19 2023 Fedora Release Engineering - 4.11.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7fb308658ede5fb5779fecc326967ba4387a7e04 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 1 Jan 2024 22:04:21 +0100 Subject: [PATCH 11/46] Update to 4.12.0 --- .gitignore | 1 + gmsh-cstdint.patch | 7 +++---- gmsh.spec | 9 ++++++--- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 8 ++++---- gmsh_med.patch | 26 +++++++++++++------------- gmsh_python.patch | 16 ++++++++-------- gmsh_unbundle_gl2ps.patch | 14 +++++++------- sources | 2 +- 10 files changed, 49 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index de04ba7..3d2035a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /gmsh-4.10.5-source-fedora.tar.xz /gmsh-4.11.0-source-fedora.tar.xz /gmsh-4.11.1-source-fedora.tar.xz +/gmsh-4.12.0-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index 8422d30..fdf5fe5 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,7 +1,6 @@ -Index: gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp -=================================================================== ---- gmsh-4.11.1-source.orig/src/mesh/meshGFacePack.cpp -+++ gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp +diff -rupN --no-dereference gmsh-4.12.0-source/src/mesh/meshGFacePack.cpp gmsh-4.12.0-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.12.0-source/src/mesh/meshGFacePack.cpp 2023-11-27 11:19:10.000000000 +0100 ++++ gmsh-4.12.0-source-new/src/mesh/meshGFacePack.cpp 2024-01-01 18:45:56.780513374 +0100 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index ab75d23..7baf0d9 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -9,7 +9,7 @@ %endif %bcond_without mpich -%global sover 4.11 +%global sover 4.12 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_without flexiblas @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.11.1 -Release: 7%{?dist} +Version: 4.12.0 +Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -401,6 +401,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Jan 01 2024 Sandro Mani - 4.12.0-1 +- Update to 4.12.0 + * Sun Oct 29 2023 Orion Poplawski - 4.11.1-7 - Rebuild for openmpi 5.0.0, drops i686 and C++ API diff --git a/gmsh_build.patch b/gmsh_build.patch index 599bcae..84cbf29 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/src/fltk/helpWindow.cpp gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.11.1-source/src/fltk/helpWindow.cpp 2022-12-21 15:34:04.580442044 +0100 -+++ gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp 2022-12-21 15:34:05.148442057 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/fltk/helpWindow.cpp gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.0-source/src/fltk/helpWindow.cpp 2024-01-01 18:45:55.706494916 +0100 ++++ gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp 2024-01-01 18:45:56.250504265 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index d951bfe..03368c2 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt ---- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:04.867442050 +0100 -+++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.872442050 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt +--- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:55.986499728 +0100 ++++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.990499796 +0100 @@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 91e6289..d3dacaf 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt ---- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:04.301442038 +0100 -+++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.586442044 +0100 -@@ -1933,7 +1933,7 @@ endif() +diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt +--- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:55.427490121 +0100 ++++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.721495173 +0100 +@@ -1963,7 +1963,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) diff --git a/gmsh_med.patch b/gmsh_med.patch index bf20da7..703b41d 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/src/common/CommandLine.cpp gmsh-4.11.1-source-new/src/common/CommandLine.cpp ---- gmsh-4.11.1-source/src/common/CommandLine.cpp 2022-09-28 20:00:58.000000000 +0200 -+++ gmsh-4.11.1-source-new/src/common/CommandLine.cpp 2022-12-21 15:34:04.306442038 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/common/CommandLine.cpp gmsh-4.12.0-source-new/src/common/CommandLine.cpp +--- gmsh-4.12.0-source/src/common/CommandLine.cpp 2023-12-21 09:07:37.000000000 +0100 ++++ gmsh-4.12.0-source-new/src/common/CommandLine.cpp 2024-01-01 18:45:55.434490241 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.11.1-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.11.1-source/src/fltk/helpWindow.cpp gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.11.1-source/src/fltk/helpWindow.cpp 2022-09-28 20:00:58.000000000 +0200 -+++ gmsh-4.11.1-source-new/src/fltk/helpWindow.cpp 2022-12-21 15:34:04.306442038 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/fltk/helpWindow.cpp gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.0-source/src/fltk/helpWindow.cpp 2023-07-21 20:57:23.000000000 +0200 ++++ gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp 2024-01-01 18:45:55.438490310 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.11.1-source/src/fltk/helpWindow.cpp gmsh-4.11 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.11.1-source/src/geo/GModelIO_MED.cpp gmsh-4.11.1-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.11.1-source/src/geo/GModelIO_MED.cpp 2022-10-19 11:45:57.000000000 +0200 -+++ gmsh-4.11.1-source-new/src/geo/GModelIO_MED.cpp 2022-12-21 15:34:04.307442038 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/geo/GModelIO_MED.cpp gmsh-4.12.0-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.12.0-source/src/geo/GModelIO_MED.cpp 2023-07-21 20:57:24.000000000 +0200 ++++ gmsh-4.12.0-source-new/src/geo/GModelIO_MED.cpp 2024-01-01 18:45:55.442490378 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,10 +34,10 @@ diff -rupN --no-dereference gmsh-4.11.1-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.11.1-source/src/post/PViewDataGModelIO.cpp gmsh-4.11.1-source-new/src/post/PViewDataGModelIO.cpp ---- gmsh-4.11.1-source/src/post/PViewDataGModelIO.cpp 2022-09-28 20:01:01.000000000 +0200 -+++ gmsh-4.11.1-source-new/src/post/PViewDataGModelIO.cpp 2022-12-21 15:34:04.307442038 +0100 -@@ -542,7 +542,7 @@ void PViewDataGModel::importLists(int N[ +diff -rupN --no-dereference gmsh-4.12.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.0-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.12.0-source/src/post/PViewDataGModelIO_MED.cpp 2023-07-21 20:57:25.000000000 +0200 ++++ gmsh-4.12.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-01 18:45:55.445490430 +0100 +@@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index d8fb69d..1ab97c3 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt ---- gmsh-4.11.1-source/CMakeLists.txt 2022-12-20 16:30:55.000000000 +0100 -+++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:04.007442031 +0100 -@@ -1915,6 +1915,8 @@ else() +diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt +--- gmsh-4.12.0-source/CMakeLists.txt 2023-12-21 09:07:36.000000000 +0100 ++++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.163485584 +0100 +@@ -1945,6 +1945,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source # mark targets as optional so we can install them separately if needed # (e.g. "make lib" or "make shared" followed by "make install/fast") install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) -@@ -1926,14 +1928,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1956,14 +1958,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.11.1-source/src/common/GmshMessage.cpp gmsh-4.11.1-source-new/src/common/GmshMessage.cpp ---- gmsh-4.11.1-source/src/common/GmshMessage.cpp 2022-11-29 17:08:32.000000000 +0100 -+++ gmsh-4.11.1-source-new/src/common/GmshMessage.cpp 2022-12-21 15:34:04.007442031 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/common/GmshMessage.cpp gmsh-4.12.0-source-new/src/common/GmshMessage.cpp +--- gmsh-4.12.0-source/src/common/GmshMessage.cpp 2023-12-21 08:34:37.000000000 +0100 ++++ gmsh-4.12.0-source-new/src/common/GmshMessage.cpp 2024-01-01 18:45:55.163485584 +0100 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index ea2c41c..748c0d3 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source-new/CMakeLists.txt ---- gmsh-4.11.1-source/CMakeLists.txt 2022-12-21 15:34:05.142442056 +0100 -+++ gmsh-4.11.1-source-new/CMakeLists.txt 2022-12-21 15:34:05.425442063 +0100 -@@ -1645,6 +1645,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB +diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt +--- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:56.246504196 +0100 ++++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:56.512508768 +0100 +@@ -1673,6 +1673,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.11.1-source/CMakeLists.txt gmsh-4.11.1-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.11.1-source/src/graphics/CMakeLists.txt gmsh-4.11.1-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.11.1-source/src/graphics/CMakeLists.txt 2022-09-28 20:00:59.000000000 +0200 -+++ gmsh-4.11.1-source-new/src/graphics/CMakeLists.txt 2022-12-21 15:34:05.425442063 +0100 +diff -rupN --no-dereference gmsh-4.12.0-source/src/graphics/CMakeLists.txt gmsh-4.12.0-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.12.0-source/src/graphics/CMakeLists.txt 2023-03-21 09:13:23.000000000 +0100 ++++ gmsh-4.12.0-source-new/src/graphics/CMakeLists.txt 2024-01-01 18:45:56.513508785 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 8155934..1a20631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.11.1-source-fedora.tar.xz) = f0f2cdf4352267de2dca47e166531fb591029522270e7b21a23706f595698dbc45046429fc613a84b60e440a0a73520b3c5f2c0c745c175ebc884b7c148039bd +SHA512 (gmsh-4.12.0-source-fedora.tar.xz) = 23aefc3bac3babab0b6576144079ff5fe7f03eb1622611783da374ffad17664b15ad6a1f17f64c7844fc5a01af7feceeb47b26af063d1da30125c430c293d31c From 124e6660e8f607b804bf72530b99b29bdc0b1903 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 14 Jan 2024 16:17:55 +0100 Subject: [PATCH 12/46] Update to 4.12.1 --- .gitignore | 1 + gmsh-cstdint.patch | 6 +++--- gmsh.spec | 5 ++++- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 12 ++++++------ gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 10 files changed, 42 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 3d2035a..250c284 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /gmsh-4.11.0-source-fedora.tar.xz /gmsh-4.11.1-source-fedora.tar.xz /gmsh-4.12.0-source-fedora.tar.xz +/gmsh-4.12.1-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index fdf5fe5..1108461 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/src/mesh/meshGFacePack.cpp gmsh-4.12.0-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.12.0-source/src/mesh/meshGFacePack.cpp 2023-11-27 11:19:10.000000000 +0100 -+++ gmsh-4.12.0-source-new/src/mesh/meshGFacePack.cpp 2024-01-01 18:45:56.780513374 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/mesh/meshGFacePack.cpp gmsh-4.12.1-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.12.1-source/src/mesh/meshGFacePack.cpp 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/mesh/meshGFacePack.cpp 2024-01-14 16:15:47.414046889 +0100 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index 7baf0d9..9eef98b 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -17,7 +17,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.12.0 +Version: 4.12.1 Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt @@ -401,6 +401,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sun Jan 14 2024 Sandro Mani - 4.12.1-1 +- Update to 4.12.1 + * Mon Jan 01 2024 Sandro Mani - 4.12.0-1 - Update to 4.12.0 diff --git a/gmsh_build.patch b/gmsh_build.patch index 84cbf29..f14cfc2 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/src/fltk/helpWindow.cpp gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.0-source/src/fltk/helpWindow.cpp 2024-01-01 18:45:55.706494916 +0100 -+++ gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp 2024-01-01 18:45:56.250504265 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/fltk/helpWindow.cpp gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.1-source/src/fltk/helpWindow.cpp 2024-01-14 16:15:46.040009279 +0100 ++++ gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp 2024-01-14 16:15:46.724028002 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index 03368c2..afea3c0 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt ---- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:55.986499728 +0100 -+++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.990499796 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt +--- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:46.380018586 +0100 ++++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:46.386018750 +0100 @@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index d3dacaf..deea0db 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt ---- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:55.427490121 +0100 -+++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.721495173 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt +--- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:45.676999343 +0100 ++++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:46.057009745 +0100 @@ -1963,7 +1963,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 703b41d..3fc1138 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/src/common/CommandLine.cpp gmsh-4.12.0-source-new/src/common/CommandLine.cpp ---- gmsh-4.12.0-source/src/common/CommandLine.cpp 2023-12-21 09:07:37.000000000 +0100 -+++ gmsh-4.12.0-source-new/src/common/CommandLine.cpp 2024-01-01 18:45:55.434490241 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/common/CommandLine.cpp gmsh-4.12.1-source-new/src/common/CommandLine.cpp +--- gmsh-4.12.1-source/src/common/CommandLine.cpp 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/common/CommandLine.cpp 2024-01-14 16:15:45.686999617 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.0-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.12.0-source/src/fltk/helpWindow.cpp gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.0-source/src/fltk/helpWindow.cpp 2023-07-21 20:57:23.000000000 +0200 -+++ gmsh-4.12.0-source-new/src/fltk/helpWindow.cpp 2024-01-01 18:45:55.438490310 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/fltk/helpWindow.cpp gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.1-source/src/fltk/helpWindow.cpp 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp 2024-01-14 16:15:45.690999726 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.12.0-source/src/fltk/helpWindow.cpp gmsh-4.12 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.12.0-source/src/geo/GModelIO_MED.cpp gmsh-4.12.0-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.12.0-source/src/geo/GModelIO_MED.cpp 2023-07-21 20:57:24.000000000 +0200 -+++ gmsh-4.12.0-source-new/src/geo/GModelIO_MED.cpp 2024-01-01 18:45:55.442490378 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/geo/GModelIO_MED.cpp gmsh-4.12.1-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.12.1-source/src/geo/GModelIO_MED.cpp 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/geo/GModelIO_MED.cpp 2024-01-14 16:15:45.694999836 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.12.0-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.12.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.0-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.12.0-source/src/post/PViewDataGModelIO_MED.cpp 2023-07-21 20:57:25.000000000 +0200 -+++ gmsh-4.12.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-01 18:45:55.445490430 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.1-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.12.1-source/src/post/PViewDataGModelIO_MED.cpp 2024-01-11 11:22:48.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-14 16:15:45.699999973 +0100 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 1ab97c3..574f97f 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt ---- gmsh-4.12.0-source/CMakeLists.txt 2023-12-21 09:07:36.000000000 +0100 -+++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:55.163485584 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt +--- gmsh-4.12.1-source/CMakeLists.txt 2024-01-11 11:22:45.000000000 +0100 ++++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:45.343990228 +0100 @@ -1945,6 +1945,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.12.0-source/src/common/GmshMessage.cpp gmsh-4.12.0-source-new/src/common/GmshMessage.cpp ---- gmsh-4.12.0-source/src/common/GmshMessage.cpp 2023-12-21 08:34:37.000000000 +0100 -+++ gmsh-4.12.0-source-new/src/common/GmshMessage.cpp 2024-01-01 18:45:55.163485584 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/common/GmshMessage.cpp gmsh-4.12.1-source-new/src/common/GmshMessage.cpp +--- gmsh-4.12.1-source/src/common/GmshMessage.cpp 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/common/GmshMessage.cpp 2024-01-14 16:15:45.343990228 +0100 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 748c0d3..2cb9e07 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source-new/CMakeLists.txt ---- gmsh-4.12.0-source/CMakeLists.txt 2024-01-01 18:45:56.246504196 +0100 -+++ gmsh-4.12.0-source-new/CMakeLists.txt 2024-01-01 18:45:56.512508768 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt +--- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:46.719027865 +0100 ++++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:47.084037856 +0100 @@ -1673,6 +1673,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.0-source/CMakeLists.txt gmsh-4.12.0-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.12.0-source/src/graphics/CMakeLists.txt gmsh-4.12.0-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.12.0-source/src/graphics/CMakeLists.txt 2023-03-21 09:13:23.000000000 +0100 -+++ gmsh-4.12.0-source-new/src/graphics/CMakeLists.txt 2024-01-01 18:45:56.513508785 +0100 +diff -rupN --no-dereference gmsh-4.12.1-source/src/graphics/CMakeLists.txt gmsh-4.12.1-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.12.1-source/src/graphics/CMakeLists.txt 2024-01-11 11:22:47.000000000 +0100 ++++ gmsh-4.12.1-source-new/src/graphics/CMakeLists.txt 2024-01-14 16:15:47.084037856 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 1a20631..8425e00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.12.0-source-fedora.tar.xz) = 23aefc3bac3babab0b6576144079ff5fe7f03eb1622611783da374ffad17664b15ad6a1f17f64c7844fc5a01af7feceeb47b26af063d1da30125c430c293d31c +SHA512 (gmsh-4.12.1-source-fedora.tar.xz) = d9ecc801fdc48631f260d46220c4554207c8cd4ead7587a1906c82e34540e6af8f68d531529f15b33c82c45075b2cf0b3770ef1989d00667e0b7aba8d4cbb8c8 From 86f72a7d6478e55fc36729d0fc1a681d5d0677bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:47:12 +0000 Subject: [PATCH 13/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 9eef98b..f6ccfa3 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -401,6 +401,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 14 2024 Sandro Mani - 4.12.1-1 - Update to 4.12.1 From c4619488f25148fd6d5f6d2ec9b58677fd15a5a8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Jan 2024 14:43:34 +0100 Subject: [PATCH 14/46] Update to 4.12.2 --- .gitignore | 1 + gmsh-cstdint.patch | 6 +++--- gmsh.spec | 7 +++++-- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 12 ++++++------ gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 10 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 250c284..c0ffb2c 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /gmsh-4.11.1-source-fedora.tar.xz /gmsh-4.12.0-source-fedora.tar.xz /gmsh-4.12.1-source-fedora.tar.xz +/gmsh-4.12.2-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index 1108461..8b7263b 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/src/mesh/meshGFacePack.cpp gmsh-4.12.1-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.12.1-source/src/mesh/meshGFacePack.cpp 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/mesh/meshGFacePack.cpp 2024-01-14 16:15:47.414046889 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp 2024-01-23 14:43:09.541297569 +0100 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index f6ccfa3..854f7c6 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.12.1 -Release: 2%{?dist} +Version: 4.12.2 +Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -401,6 +401,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Jan 23 2024 Sandro Mani - 4.12.2-1 +- Update to 4.12.2 + * Fri Jan 19 2024 Fedora Release Engineering - 4.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/gmsh_build.patch b/gmsh_build.patch index f14cfc2..97672e2 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/src/fltk/helpWindow.cpp gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.1-source/src/fltk/helpWindow.cpp 2024-01-14 16:15:46.040009279 +0100 -+++ gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp 2024-01-14 16:15:46.724028002 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-23 14:43:08.538227497 +0100 ++++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-23 14:43:09.046262954 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index afea3c0..f9743df 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt ---- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:46.380018586 +0100 -+++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:46.386018750 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:08.796245501 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.801245850 +0100 @@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index deea0db..8082f59 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt ---- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:45.676999343 +0100 -+++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:46.057009745 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:08.272208935 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.551228404 +0100 @@ -1963,7 +1963,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 3fc1138..80454de 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/src/common/CommandLine.cpp gmsh-4.12.1-source-new/src/common/CommandLine.cpp ---- gmsh-4.12.1-source/src/common/CommandLine.cpp 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/common/CommandLine.cpp 2024-01-14 16:15:45.686999617 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/common/CommandLine.cpp gmsh-4.12.2-source-new/src/common/CommandLine.cpp +--- gmsh-4.12.2-source/src/common/CommandLine.cpp 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/common/CommandLine.cpp 2024-01-23 14:43:08.279209423 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.1-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.12.1-source/src/fltk/helpWindow.cpp gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.1-source/src/fltk/helpWindow.cpp 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/fltk/helpWindow.cpp 2024-01-14 16:15:45.690999726 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-23 14:43:08.283209702 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.12.1-source/src/fltk/helpWindow.cpp gmsh-4.12 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.12.1-source/src/geo/GModelIO_MED.cpp gmsh-4.12.1-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.12.1-source/src/geo/GModelIO_MED.cpp 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/geo/GModelIO_MED.cpp 2024-01-14 16:15:45.694999836 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp 2024-01-23 14:43:08.286209911 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.12.1-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.12.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.1-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.12.1-source/src/post/PViewDataGModelIO_MED.cpp 2024-01-11 11:22:48.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-14 16:15:45.699999973 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-23 14:43:08.289210121 +0100 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 574f97f..0b7e5e2 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt ---- gmsh-4.12.1-source/CMakeLists.txt 2024-01-11 11:22:45.000000000 +0100 -+++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:45.343990228 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-21 20:30:30.000000000 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.024191628 +0100 @@ -1945,6 +1945,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.12.1-source/src/common/GmshMessage.cpp gmsh-4.12.1-source-new/src/common/GmshMessage.cpp ---- gmsh-4.12.1-source/src/common/GmshMessage.cpp 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/common/GmshMessage.cpp 2024-01-14 16:15:45.343990228 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/common/GmshMessage.cpp gmsh-4.12.2-source-new/src/common/GmshMessage.cpp +--- gmsh-4.12.2-source/src/common/GmshMessage.cpp 2024-01-21 19:20:06.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/common/GmshMessage.cpp 2024-01-23 14:43:08.026191768 +0100 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 2cb9e07..fc0281c 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source-new/CMakeLists.txt ---- gmsh-4.12.1-source/CMakeLists.txt 2024-01-14 16:15:46.719027865 +0100 -+++ gmsh-4.12.1-source-new/CMakeLists.txt 2024-01-14 16:15:47.084037856 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:09.042262675 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:09.294280297 +0100 @@ -1673,6 +1673,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.1-source/CMakeLists.txt gmsh-4.12.1-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.12.1-source/src/graphics/CMakeLists.txt gmsh-4.12.1-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.12.1-source/src/graphics/CMakeLists.txt 2024-01-11 11:22:47.000000000 +0100 -+++ gmsh-4.12.1-source-new/src/graphics/CMakeLists.txt 2024-01-14 16:15:47.084037856 +0100 +diff -rupN --no-dereference gmsh-4.12.2-source/src/graphics/CMakeLists.txt gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.12.2-source/src/graphics/CMakeLists.txt 2024-01-18 17:52:07.000000000 +0100 ++++ gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt 2024-01-23 14:43:09.294280297 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 8425e00..79914b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.12.1-source-fedora.tar.xz) = d9ecc801fdc48631f260d46220c4554207c8cd4ead7587a1906c82e34540e6af8f68d531529f15b33c82c45075b2cf0b3770ef1989d00667e0b7aba8d4cbb8c8 +SHA512 (gmsh-4.12.2-source-fedora.tar.xz) = a4231206c63fdd53fa166620036dd151124fe46f368b5f4009b3937ad762aa4648d0b2358c41a2a686bdaa529caefabd0e6e153bde1c047179f3230342238fe1 From b40eb58ce9992c35dfa41c7c0817053f9b73e250 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 28 Jan 2024 10:48:30 +0100 Subject: [PATCH 15/46] Add gmsh_uint64.patch --- gmsh-cstdint.patch | 2 +- gmsh.spec | 2 ++ gmsh_build.patch | 4 ++-- gmsh_install.patch | 4 ++-- gmsh_julia.patch | 4 ++-- gmsh_med.patch | 8 +++---- gmsh_python.patch | 4 ++-- gmsh_uint64.patch | 50 +++++++++++++++++++++++++++++++++++++++ gmsh_unbundle_gl2ps.patch | 6 ++--- 9 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 gmsh_uint64.patch diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index 8b7263b..6f8fe6d 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp --- gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp 2024-01-23 14:43:09.541297569 +0100 ++++ gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp 2024-01-27 23:09:41.658172312 +0100 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index 854f7c6..30712de 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -43,6 +43,8 @@ Patch4: gmsh_build.patch Patch5: gmsh_unbundle_gl2ps.patch # Header fix for GCC 13 Patch6: gmsh-cstdint.patch +# Fix incompatible size_t* -> uint64_t* conversions +Patch7: gmsh_uint64.patch BuildRequires: alglib-devel BuildRequires: ann-devel diff --git a/gmsh_build.patch b/gmsh_build.patch index 97672e2..548e45f 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-23 14:43:08.538227497 +0100 -+++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-23 14:43:09.046262954 +0100 +--- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-27 23:09:40.529174116 +0100 ++++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-27 23:09:41.096173209 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index f9743df..28428b7 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:08.796245501 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.801245850 +0100 +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:40.815173658 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:40.819173652 +0100 @@ -275,7 +275,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 8082f59..5573ed9 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:08.272208935 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.551228404 +0100 +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:40.232174592 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:40.544174092 +0100 @@ -1963,7 +1963,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 80454de..09909e4 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/common/CommandLine.cpp gmsh-4.12.2-source-new/src/common/CommandLine.cpp --- gmsh-4.12.2-source/src/common/CommandLine.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/common/CommandLine.cpp 2024-01-23 14:43:08.279209423 +0100 ++++ gmsh-4.12.2-source-new/src/common/CommandLine.cpp 2024-01-27 23:09:40.239174580 +0100 @@ -42,7 +42,7 @@ #endif @@ -12,7 +12,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/common/CommandLine.cpp gmsh-4 #if defined(HAVE_POST) diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp --- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-23 14:43:08.283209702 +0100 ++++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-27 23:09:40.243174574 +0100 @@ -36,7 +36,7 @@ #endif @@ -24,7 +24,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12 static const char *help_link(Fl_Widget *w, const char *uri) diff -rupN --no-dereference gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp --- gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp 2024-01-23 14:43:08.286209911 +0100 ++++ gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp 2024-01-27 23:09:40.246174569 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -36,7 +36,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp gmsh-4.1 // To avoid too many ifdefs below we use defines for the bits of the diff -rupN --no-dereference gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp --- gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-23 14:43:08.289210121 +0100 ++++ gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-27 23:09:40.250174563 +0100 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 0b7e5e2..c3954d0 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt --- gmsh-4.12.2-source/CMakeLists.txt 2024-01-21 20:30:30.000000000 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:08.024191628 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:39.952175040 +0100 @@ -1945,6 +1945,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -30,7 +30,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen diff -rupN --no-dereference gmsh-4.12.2-source/src/common/GmshMessage.cpp gmsh-4.12.2-source-new/src/common/GmshMessage.cpp --- gmsh-4.12.2-source/src/common/GmshMessage.cpp 2024-01-21 19:20:06.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/common/GmshMessage.cpp 2024-01-23 14:43:08.026191768 +0100 ++++ gmsh-4.12.2-source-new/src/common/GmshMessage.cpp 2024-01-27 23:09:39.953175038 +0100 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_uint64.patch b/gmsh_uint64.patch new file mode 100644 index 0000000..008b7de --- /dev/null +++ b/gmsh_uint64.patch @@ -0,0 +1,50 @@ +diff -rupN --no-dereference gmsh-4.12.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.12.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c +--- gmsh-4.12.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-01-11 11:22:46.000000000 +0100 ++++ gmsh-4.12.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-01-27 23:09:41.938171865 +0100 +@@ -297,11 +297,11 @@ static uint64_t* scanbsearch(uint64_t* a + * - startTet[maxThreads] = mesh->tetrahedra.num + * - `startPt[t+1] - startPt[t]` gives how many point will be created by thread t + */ +-static HXTStatus balanceRefineWork(HXTMesh* mesh, uint32_t* startPt, size_t* startTet, int maxThreads) ++static HXTStatus balanceRefineWork(HXTMesh* mesh, uint32_t* startPt, uint64_t* startTet, int maxThreads) + { +- size_t* scan; ++ uint64_t* scan; + uint32_t ptPerThreadGoal; +- HXT_CHECK( hxtAlignedMalloc(&scan, sizeof(size_t) * mesh->tetrahedra.num) ); ++ HXT_CHECK( hxtAlignedMalloc(&scan, sizeof(uint64_t) * mesh->tetrahedra.num) ); + + #pragma omp parallel num_threads(maxThreads) + { +@@ -318,9 +318,9 @@ static HXTStatus balanceRefineWork(HXTMe + #pragma omp single + { + // we do a simple prefix sum +- size_t sum = 0; ++ uint32_t sum = 0; + for(int t=0; ttetrahedra.num; i++) { +- size_t inc = scan[i]; ++ uint64_t inc = scan[i]; + scan[i] = s; + s += inc; + } + +- size_t scanToFind = threadID * ptPerThreadGoal; ++ uint64_t scanToFind = threadID * ptPerThreadGoal; + + // we want to find i such that scan[i] = scanToFind. + // we do a simple binary search in the prefix scan array to find `i` +- size_t* pfnd = scanbsearch(scan, scanToFind, mesh->tetrahedra.num); ++ uint64_t* pfnd = scanbsearch(scan, scanToFind, mesh->tetrahedra.num); + startTet[threadID] = pfnd - scan; + if(startTet[threadID] < mesh->tetrahedra.num) + startPt[threadID] = *pfnd; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index fc0281c..4220fe6 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-23 14:43:09.042262675 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-23 14:43:09.294280297 +0100 +--- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:41.091173217 +0100 ++++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:41.375172763 +0100 @@ -1673,6 +1673,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -12,7 +12,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source if(HAVE_OCC) diff -rupN --no-dereference gmsh-4.12.2-source/src/graphics/CMakeLists.txt gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt --- gmsh-4.12.2-source/src/graphics/CMakeLists.txt 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt 2024-01-23 14:43:09.294280297 +0100 ++++ gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt 2024-01-27 23:09:41.375172763 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp From a0e6eb3423283cb461389bdfc4abda5f059e92aa Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 7 Feb 2024 09:12:48 +0100 Subject: [PATCH 16/46] Convert to SPDX license --- gmsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 30712de..1fcfca7 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -22,7 +22,7 @@ Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt -License: GPLv2+ with exceptions and MIT +License: GPL-2.0-with-Gmsh-exception AND MIT URL: http://geuz.org/gmsh/ # Download source from http://geuz.org/gmsh/src/%%{name}-%%{version}-source.tgz # Delete contrib/blossom and contrib/mpeg_encode from source archive From b3ca0c362e83a0a5072346cff910b599e0c707fc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 27 Feb 2024 10:56:30 +0100 Subject: [PATCH 17/46] Update to 4.13.0 --- .gitignore | 1 + gmsh-cstdint.patch | 6 +++--- gmsh.spec | 7 +++++-- gmsh_build.patch | 6 +++--- gmsh_install.patch | 8 ++++---- gmsh_julia.patch | 8 ++++---- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 16 ++++++++-------- gmsh_uint64.patch | 6 +++--- gmsh_unbundle_gl2ps.patch | 14 +++++++------- sources | 2 +- 11 files changed, 51 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index c0ffb2c..6188bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /gmsh-4.12.0-source-fedora.tar.xz /gmsh-4.12.1-source-fedora.tar.xz /gmsh-4.12.2-source-fedora.tar.xz +/gmsh-4.13.0-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index 6f8fe6d..f526c83 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.12.2-source/src/mesh/meshGFacePack.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/mesh/meshGFacePack.cpp 2024-01-27 23:09:41.658172312 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/mesh/meshGFacePack.cpp gmsh-4.13.0-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.13.0-source/src/mesh/meshGFacePack.cpp 2024-02-23 20:59:01.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/mesh/meshGFacePack.cpp 2024-02-27 08:32:04.394029102 +0100 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index 1fcfca7..5ee3762 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -9,7 +9,7 @@ %endif %bcond_without mpich -%global sover 4.12 +%global sover 4.13 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_without flexiblas @@ -17,7 +17,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.12.2 +Version: 4.13.0 Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt @@ -403,6 +403,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Feb 27 2024 Sandro Mani - 4.13.0-1 +- Update to 4.13.0 + * Tue Jan 23 2024 Sandro Mani - 4.12.2-1 - Update to 4.12.2 diff --git a/gmsh_build.patch b/gmsh_build.patch index 548e45f..66da5df 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-27 23:09:40.529174116 +0100 -+++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-27 23:09:41.096173209 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/fltk/helpWindow.cpp gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.0-source/src/fltk/helpWindow.cpp 2024-02-27 08:32:03.259072080 +0100 ++++ gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp 2024-02-27 08:32:03.825050653 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index 28428b7..c8fff0a 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:40.815173658 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:40.819173652 +0100 -@@ -275,7 +275,7 @@ if(ENABLE_RPATH) +diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt +--- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:03.547061177 +0100 ++++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:03.553060950 +0100 +@@ -279,7 +279,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 5573ed9..06b4ba9 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:40.232174592 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:40.544174092 +0100 -@@ -1963,7 +1963,7 @@ endif() +diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt +--- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:02.960083398 +0100 ++++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:03.274071512 +0100 +@@ -2004,7 +2004,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 09909e4..511dc8b 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/src/common/CommandLine.cpp gmsh-4.12.2-source-new/src/common/CommandLine.cpp ---- gmsh-4.12.2-source/src/common/CommandLine.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/common/CommandLine.cpp 2024-01-27 23:09:40.239174580 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/common/CommandLine.cpp gmsh-4.13.0-source-new/src/common/CommandLine.cpp +--- gmsh-4.13.0-source/src/common/CommandLine.cpp 2024-02-23 20:59:00.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/common/CommandLine.cpp 2024-02-27 08:32:02.968083095 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.12.2-source/src/fltk/helpWindow.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/fltk/helpWindow.cpp 2024-01-27 23:09:40.243174574 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/fltk/helpWindow.cpp gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.0-source/src/fltk/helpWindow.cpp 2024-02-23 20:59:00.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp 2024-02-27 08:32:02.971082982 +0100 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/fltk/helpWindow.cpp gmsh-4.12 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/geo/GModelIO_MED.cpp 2024-01-27 23:09:40.246174569 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/geo/GModelIO_MED.cpp gmsh-4.13.0-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.13.0-source/src/geo/GModelIO_MED.cpp 2024-02-23 20:59:00.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/geo/GModelIO_MED.cpp 2024-02-27 08:32:02.975082831 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.12.2-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.12.2-source/src/post/PViewDataGModelIO_MED.cpp 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-01-27 23:09:40.250174563 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.0-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.13.0-source/src/post/PViewDataGModelIO_MED.cpp 2024-02-23 20:59:01.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-02-27 08:32:02.978082717 +0100 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index c3954d0..2639864 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-21 20:30:30.000000000 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:39.952175040 +0100 -@@ -1945,6 +1945,8 @@ else() +diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt +--- gmsh-4.13.0-source/CMakeLists.txt 2024-02-23 20:58:58.000000000 +0100 ++++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:02.681093953 +0100 +@@ -1986,6 +1986,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source # mark targets as optional so we can install them separately if needed # (e.g. "make lib" or "make shared" followed by "make install/fast") install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) -@@ -1956,14 +1958,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1997,14 +1999,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.12.2-source/src/common/GmshMessage.cpp gmsh-4.12.2-source-new/src/common/GmshMessage.cpp ---- gmsh-4.12.2-source/src/common/GmshMessage.cpp 2024-01-21 19:20:06.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/common/GmshMessage.cpp 2024-01-27 23:09:39.953175038 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/common/GmshMessage.cpp gmsh-4.13.0-source-new/src/common/GmshMessage.cpp +--- gmsh-4.13.0-source/src/common/GmshMessage.cpp 2024-02-23 20:59:00.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/common/GmshMessage.cpp 2024-02-27 08:32:02.682093915 +0100 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_uint64.patch b/gmsh_uint64.patch index 008b7de..56971f7 100644 --- a/gmsh_uint64.patch +++ b/gmsh_uint64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.12.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c ---- gmsh-4.12.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-01-11 11:22:46.000000000 +0100 -+++ gmsh-4.12.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-01-27 23:09:41.938171865 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.0-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c +--- gmsh-4.13.0-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-02-23 20:58:59.000000000 +0100 ++++ gmsh-4.13.0-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-02-27 08:32:04.683018154 +0100 @@ -297,11 +297,11 @@ static uint64_t* scanbsearch(uint64_t* a * - startTet[maxThreads] = mesh->tetrahedra.num * - `startPt[t+1] - startPt[t]` gives how many point will be created by thread t diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 4220fe6..7946be6 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source-new/CMakeLists.txt ---- gmsh-4.12.2-source/CMakeLists.txt 2024-01-27 23:09:41.091173217 +0100 -+++ gmsh-4.12.2-source-new/CMakeLists.txt 2024-01-27 23:09:41.375172763 +0100 -@@ -1673,6 +1673,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB +diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt +--- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:03.820050842 +0100 ++++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:04.112039785 +0100 +@@ -1714,6 +1714,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.12.2-source/CMakeLists.txt gmsh-4.12.2-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.12.2-source/src/graphics/CMakeLists.txt gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.12.2-source/src/graphics/CMakeLists.txt 2024-01-18 17:52:07.000000000 +0100 -+++ gmsh-4.12.2-source-new/src/graphics/CMakeLists.txt 2024-01-27 23:09:41.375172763 +0100 +diff -rupN --no-dereference gmsh-4.13.0-source/src/graphics/CMakeLists.txt gmsh-4.13.0-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.13.0-source/src/graphics/CMakeLists.txt 2024-02-23 20:59:01.000000000 +0100 ++++ gmsh-4.13.0-source-new/src/graphics/CMakeLists.txt 2024-02-27 08:32:04.112039785 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 79914b5..b6f4f20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.12.2-source-fedora.tar.xz) = a4231206c63fdd53fa166620036dd151124fe46f368b5f4009b3937ad762aa4648d0b2358c41a2a686bdaa529caefabd0e6e153bde1c047179f3230342238fe1 +SHA512 (gmsh-4.13.0-source-fedora.tar.xz) = dc89b3be0d028032a8a6fb7719ce7b8e684538f7a37fde7a760f5e41c2e385b94e5eebe4de3bed401b707b6d9ef6ad9a03a0c9330627582084afc14f1c4f521f From 67b28c99b31ce693eecdb8a7477759b675d4a0d6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 29 Mar 2024 18:42:27 -0500 Subject: [PATCH 18/46] Rebuild for OpenCascade 7.8.0. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 5ee3762..c56c411 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.0 -Release: 1%{?dist} +Release: 2%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -403,6 +403,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Mar 29 2024 Richard Shaw - 4.13.0-2 +- Rebuild for OpenCascade 7.8.0. + * Tue Feb 27 2024 Sandro Mani - 4.13.0-1 - Update to 4.13.0 From a6a3e85f3d79179f6b2307bddef045f3922120d5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Apr 2024 17:04:25 -0400 Subject: [PATCH 19/46] Ensure python3-gmsh depends on gmsh-libs --- gmsh.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index c56c411..432b263 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.0 -Release: 2%{?dist} +Release: 3%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -119,6 +119,8 @@ Summary: Python3 API for %{name} %{?python_provide:%python_provide python3-%{name}} Obsoletes: python3-%{name}-private +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + %description -n python3-%{name} Python3 API for %{name}. @@ -403,6 +405,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Apr 09 2024 Benjamin A. Beasley - 4.13.0-3 +- Ensure python3-gmsh depends on gmsh-libs + * Fri Mar 29 2024 Richard Shaw - 4.13.0-2 - Rebuild for OpenCascade 7.8.0. From f9c59e95f82a370fa33fbc4eda49412fe878eeca Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 9 Apr 2024 17:15:22 -0400 Subject: [PATCH 20/46] Make the python3-gmsh subpackage noarch, since the bindings are pure Python --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 432b263..93b78ed 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -119,7 +119,9 @@ Summary: Python3 API for %{name} %{?python_provide:%python_provide python3-%{name}} Obsoletes: python3-%{name}-private -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +BuildArch: noarch + +Requires: %{name}-libs = %{version}-%{release} %description -n python3-%{name} Python3 API for %{name}. @@ -407,6 +409,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog * Tue Apr 09 2024 Benjamin A. Beasley - 4.13.0-3 - Ensure python3-gmsh depends on gmsh-libs +- Make the python3-gmsh subpackage noarch, since the bindings are pure Python * Fri Mar 29 2024 Richard Shaw - 4.13.0-2 - Rebuild for OpenCascade 7.8.0. From 41bc6039e5c9dfd76b7acfd40d86bdf0ec44c4c7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 8 May 2024 11:43:24 +0200 Subject: [PATCH 21/46] Update to 4.13.1 --- .gitignore | 1 + gmsh-cstdint.patch | 6 +++--- gmsh.spec | 9 +++++++-- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 12 ++++++------ gmsh_uint64.patch | 6 +++--- gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 6188bc3..5a0ceaa 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /gmsh-4.12.1-source-fedora.tar.xz /gmsh-4.12.2-source-fedora.tar.xz /gmsh-4.13.0-source-fedora.tar.xz +/gmsh-4.13.1-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index f526c83..a2d446d 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/src/mesh/meshGFacePack.cpp gmsh-4.13.0-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.13.0-source/src/mesh/meshGFacePack.cpp 2024-02-23 20:59:01.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/mesh/meshGFacePack.cpp 2024-02-27 08:32:04.394029102 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/mesh/meshGFacePack.cpp gmsh-4.13.1-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.13.1-source/src/mesh/meshGFacePack.cpp 2024-03-29 23:07:01.000000000 +0100 ++++ gmsh-4.13.1-source-new/src/mesh/meshGFacePack.cpp 2024-05-08 09:40:57.743517633 +0200 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index 93b78ed..d592101 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -17,8 +17,10 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.13.0 -Release: 3%{?dist} +Version: 4.13.1 +Release: 1%{?dist} +# MPI not available on i686 +ExcludeArch: %{ix86} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -407,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed May 08 2024 Sandro Mani - 4.13.1-1 +- Update to 4.13.1 + * Tue Apr 09 2024 Benjamin A. Beasley - 4.13.0-3 - Ensure python3-gmsh depends on gmsh-libs - Make the python3-gmsh subpackage noarch, since the bindings are pure Python diff --git a/gmsh_build.patch b/gmsh_build.patch index 66da5df..b909104 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/src/fltk/helpWindow.cpp gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.0-source/src/fltk/helpWindow.cpp 2024-02-27 08:32:03.259072080 +0100 -+++ gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp 2024-02-27 08:32:03.825050653 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/fltk/helpWindow.cpp gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.1-source/src/fltk/helpWindow.cpp 2024-05-08 09:40:56.610523715 +0200 ++++ gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp 2024-05-08 09:40:57.186520623 +0200 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index c8fff0a..01b707c 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt ---- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:03.547061177 +0100 -+++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:03.553060950 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt +--- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:56.889522217 +0200 ++++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:56.896522180 +0200 @@ -279,7 +279,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 06b4ba9..4a2c250 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt ---- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:02.960083398 +0100 -+++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:03.274071512 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt +--- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:56.255525620 +0200 ++++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:56.615523688 +0200 @@ -2004,7 +2004,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 511dc8b..609984c 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/src/common/CommandLine.cpp gmsh-4.13.0-source-new/src/common/CommandLine.cpp ---- gmsh-4.13.0-source/src/common/CommandLine.cpp 2024-02-23 20:59:00.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/common/CommandLine.cpp 2024-02-27 08:32:02.968083095 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/common/CommandLine.cpp gmsh-4.13.1-source-new/src/common/CommandLine.cpp +--- gmsh-4.13.1-source/src/common/CommandLine.cpp 2024-04-18 16:52:42.000000000 +0200 ++++ gmsh-4.13.1-source-new/src/common/CommandLine.cpp 2024-05-08 09:40:56.260525593 +0200 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.0-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.13.0-source/src/fltk/helpWindow.cpp gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.0-source/src/fltk/helpWindow.cpp 2024-02-23 20:59:00.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/fltk/helpWindow.cpp 2024-02-27 08:32:02.971082982 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/fltk/helpWindow.cpp gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.1-source/src/fltk/helpWindow.cpp 2024-03-29 23:07:00.000000000 +0100 ++++ gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp 2024-05-08 09:40:56.260525593 +0200 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.13.0-source/src/fltk/helpWindow.cpp gmsh-4.13 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.13.0-source/src/geo/GModelIO_MED.cpp gmsh-4.13.0-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.13.0-source/src/geo/GModelIO_MED.cpp 2024-02-23 20:59:00.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/geo/GModelIO_MED.cpp 2024-02-27 08:32:02.975082831 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/geo/GModelIO_MED.cpp gmsh-4.13.1-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.13.1-source/src/geo/GModelIO_MED.cpp 2024-03-29 23:07:00.000000000 +0100 ++++ gmsh-4.13.1-source-new/src/geo/GModelIO_MED.cpp 2024-05-08 09:40:56.260525593 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.13.0-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.13.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.0-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.13.0-source/src/post/PViewDataGModelIO_MED.cpp 2024-02-23 20:59:01.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-02-27 08:32:02.978082717 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.1-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.13.1-source/src/post/PViewDataGModelIO_MED.cpp 2024-03-29 23:07:01.000000000 +0100 ++++ gmsh-4.13.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-05-08 09:40:56.261525588 +0200 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 2639864..72c67b9 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt ---- gmsh-4.13.0-source/CMakeLists.txt 2024-02-23 20:58:58.000000000 +0100 -+++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:02.681093953 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt +--- gmsh-4.13.1-source/CMakeLists.txt 2024-05-07 17:55:05.000000000 +0200 ++++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:55.962527192 +0200 @@ -1986,6 +1986,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.13.0-source/src/common/GmshMessage.cpp gmsh-4.13.0-source-new/src/common/GmshMessage.cpp ---- gmsh-4.13.0-source/src/common/GmshMessage.cpp 2024-02-23 20:59:00.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/common/GmshMessage.cpp 2024-02-27 08:32:02.682093915 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/common/GmshMessage.cpp gmsh-4.13.1-source-new/src/common/GmshMessage.cpp +--- gmsh-4.13.1-source/src/common/GmshMessage.cpp 2024-05-05 09:36:23.000000000 +0200 ++++ gmsh-4.13.1-source-new/src/common/GmshMessage.cpp 2024-05-08 09:40:55.963527187 +0200 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_uint64.patch b/gmsh_uint64.patch index 56971f7..d9214c5 100644 --- a/gmsh_uint64.patch +++ b/gmsh_uint64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.0-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c ---- gmsh-4.13.0-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-02-23 20:58:59.000000000 +0100 -+++ gmsh-4.13.0-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-02-27 08:32:04.683018154 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.1-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c +--- gmsh-4.13.1-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-03-29 23:06:57.000000000 +0100 ++++ gmsh-4.13.1-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-05-08 09:40:58.017516162 +0200 @@ -297,11 +297,11 @@ static uint64_t* scanbsearch(uint64_t* a * - startTet[maxThreads] = mesh->tetrahedra.num * - `startPt[t+1] - startPt[t]` gives how many point will be created by thread t diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 7946be6..c0b9ff0 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source-new/CMakeLists.txt ---- gmsh-4.13.0-source/CMakeLists.txt 2024-02-27 08:32:03.820050842 +0100 -+++ gmsh-4.13.0-source-new/CMakeLists.txt 2024-02-27 08:32:04.112039785 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt +--- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:57.182520645 +0200 ++++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:57.462519142 +0200 @@ -1714,6 +1714,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.0-source/CMakeLists.txt gmsh-4.13.0-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.13.0-source/src/graphics/CMakeLists.txt gmsh-4.13.0-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.13.0-source/src/graphics/CMakeLists.txt 2024-02-23 20:59:01.000000000 +0100 -+++ gmsh-4.13.0-source-new/src/graphics/CMakeLists.txt 2024-02-27 08:32:04.112039785 +0100 +diff -rupN --no-dereference gmsh-4.13.1-source/src/graphics/CMakeLists.txt gmsh-4.13.1-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.13.1-source/src/graphics/CMakeLists.txt 2024-03-29 23:07:01.000000000 +0100 ++++ gmsh-4.13.1-source-new/src/graphics/CMakeLists.txt 2024-05-08 09:40:57.463519136 +0200 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index b6f4f20..43bfc13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.13.0-source-fedora.tar.xz) = dc89b3be0d028032a8a6fb7719ce7b8e684538f7a37fde7a760f5e41c2e385b94e5eebe4de3bed401b707b6d9ef6ad9a03a0c9330627582084afc14f1c4f521f +SHA512 (gmsh-4.13.1-source-fedora.tar.xz) = 95ebfc4649d1ca865bfad7d55b585fb0b2d18421b376bf3b42fd692f1789ae3c6d3006e62384dca7c95e73926c9624f75147aeece1719e53137af33f2e27b7ee From 47ae6f39cf098dadd74b2e64f9ea2be412acbbd7 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 1 Jun 2024 19:17:16 -0500 Subject: [PATCH 22/46] Rebuild for opencascade 7.8.1. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index d592101..c85e4a9 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sun Jun 02 2024 Richard Shaw - 4.13.1-2 +- Rebuild for opencascade 7.8.1. + * Wed May 08 2024 Sandro Mani - 4.13.1-1 - Update to 4.13.1 From 910b41b9945570285aed3f5f445eca5b7aa9510c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 4 Jun 2024 13:43:21 +0200 Subject: [PATCH 23/46] Update to 4.13.2 --- .gitignore | 1 + gmsh-cstdint.patch | 6 +++--- gmsh.spec | 7 +++++-- gmsh_build.patch | 6 +++--- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 12 ++++++------ gmsh_uint64.patch | 6 +++--- gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 5a0ceaa..79b05cc 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /gmsh-4.12.2-source-fedora.tar.xz /gmsh-4.13.0-source-fedora.tar.xz /gmsh-4.13.1-source-fedora.tar.xz +/gmsh-4.13.2-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch index a2d446d..e13d68c 100644 --- a/gmsh-cstdint.patch +++ b/gmsh-cstdint.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/src/mesh/meshGFacePack.cpp gmsh-4.13.1-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.13.1-source/src/mesh/meshGFacePack.cpp 2024-03-29 23:07:01.000000000 +0100 -+++ gmsh-4.13.1-source-new/src/mesh/meshGFacePack.cpp 2024-05-08 09:40:57.743517633 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/mesh/meshGFacePack.cpp gmsh-4.13.2-source-new/src/mesh/meshGFacePack.cpp +--- gmsh-4.13.2-source/src/mesh/meshGFacePack.cpp 2024-06-04 06:53:31.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/mesh/meshGFacePack.cpp 2024-06-04 13:43:09.693028118 +0200 @@ -5,6 +5,7 @@ #include diff --git a/gmsh.spec b/gmsh.spec index c85e4a9..b13d5ee 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.13.1 -Release: 2%{?dist} +Version: 4.13.2 +Release: 1%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Jun 04 2024 Sandro Mani - 4.13.2-1 +- Update to 4.13.2 + * Sun Jun 02 2024 Richard Shaw - 4.13.1-2 - Rebuild for opencascade 7.8.1. diff --git a/gmsh_build.patch b/gmsh_build.patch index b909104..d80193b 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/src/fltk/helpWindow.cpp gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.1-source/src/fltk/helpWindow.cpp 2024-05-08 09:40:56.610523715 +0200 -+++ gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp 2024-05-08 09:40:57.186520623 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/fltk/helpWindow.cpp gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.2-source/src/fltk/helpWindow.cpp 2024-06-04 13:43:08.587008087 +0200 ++++ gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp 2024-06-04 13:43:09.135018012 +0200 @@ -3,6 +3,12 @@ // See the LICENSE.txt file in the Gmsh root directory for license information. // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. diff --git a/gmsh_install.patch b/gmsh_install.patch index 01b707c..4703c11 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt ---- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:56.889522217 +0200 -+++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:56.896522180 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt +--- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:08.858012995 +0200 ++++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.863013086 +0200 @@ -279,7 +279,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 4a2c250..6d1f5d3 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt ---- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:56.255525620 +0200 -+++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:56.615523688 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt +--- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:08.318003215 +0200 ++++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.592008178 +0200 @@ -2004,7 +2004,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 609984c..a9975b7 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/src/common/CommandLine.cpp gmsh-4.13.1-source-new/src/common/CommandLine.cpp ---- gmsh-4.13.1-source/src/common/CommandLine.cpp 2024-04-18 16:52:42.000000000 +0200 -+++ gmsh-4.13.1-source-new/src/common/CommandLine.cpp 2024-05-08 09:40:56.260525593 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/common/CommandLine.cpp gmsh-4.13.2-source-new/src/common/CommandLine.cpp +--- gmsh-4.13.2-source/src/common/CommandLine.cpp 2024-06-04 06:53:29.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/common/CommandLine.cpp 2024-06-04 13:43:08.323003306 +0200 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.1-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.13.1-source/src/fltk/helpWindow.cpp gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.1-source/src/fltk/helpWindow.cpp 2024-03-29 23:07:00.000000000 +0100 -+++ gmsh-4.13.1-source-new/src/fltk/helpWindow.cpp 2024-05-08 09:40:56.260525593 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/fltk/helpWindow.cpp gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.13.2-source/src/fltk/helpWindow.cpp 2024-06-04 06:53:29.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp 2024-06-04 13:43:08.323003306 +0200 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.13.1-source/src/fltk/helpWindow.cpp gmsh-4.13 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.13.1-source/src/geo/GModelIO_MED.cpp gmsh-4.13.1-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.13.1-source/src/geo/GModelIO_MED.cpp 2024-03-29 23:07:00.000000000 +0100 -+++ gmsh-4.13.1-source-new/src/geo/GModelIO_MED.cpp 2024-05-08 09:40:56.260525593 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/geo/GModelIO_MED.cpp gmsh-4.13.2-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.13.2-source/src/geo/GModelIO_MED.cpp 2024-06-04 06:53:30.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/geo/GModelIO_MED.cpp 2024-06-04 13:43:08.323003306 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.13.1-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.13.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.1-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.13.1-source/src/post/PViewDataGModelIO_MED.cpp 2024-03-29 23:07:01.000000000 +0100 -+++ gmsh-4.13.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-05-08 09:40:56.261525588 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.2-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.13.2-source/src/post/PViewDataGModelIO_MED.cpp 2024-06-04 06:53:31.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-06-04 13:43:08.324003324 +0200 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 72c67b9..72beafd 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt ---- gmsh-4.13.1-source/CMakeLists.txt 2024-05-07 17:55:05.000000000 +0200 -+++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:55.962527192 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt +--- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 06:53:22.000000000 +0200 ++++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.039998180 +0200 @@ -1986,6 +1986,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.13.1-source/src/common/GmshMessage.cpp gmsh-4.13.1-source-new/src/common/GmshMessage.cpp ---- gmsh-4.13.1-source/src/common/GmshMessage.cpp 2024-05-05 09:36:23.000000000 +0200 -+++ gmsh-4.13.1-source-new/src/common/GmshMessage.cpp 2024-05-08 09:40:55.963527187 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/common/GmshMessage.cpp gmsh-4.13.2-source-new/src/common/GmshMessage.cpp +--- gmsh-4.13.2-source/src/common/GmshMessage.cpp 2024-06-04 07:36:27.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/common/GmshMessage.cpp 2024-06-04 13:43:08.040998199 +0200 @@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_uint64.patch b/gmsh_uint64.patch index d9214c5..286e013 100644 --- a/gmsh_uint64.patch +++ b/gmsh_uint64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.1-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c ---- gmsh-4.13.1-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-03-29 23:06:57.000000000 +0100 -+++ gmsh-4.13.1-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-05-08 09:40:58.017516162 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c +--- gmsh-4.13.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-06-04 06:53:26.000000000 +0200 ++++ gmsh-4.13.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-06-04 13:43:09.971033153 +0200 @@ -297,11 +297,11 @@ static uint64_t* scanbsearch(uint64_t* a * - startTet[maxThreads] = mesh->tetrahedra.num * - `startPt[t+1] - startPt[t]` gives how many point will be created by thread t diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index c0b9ff0..ff8401c 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source-new/CMakeLists.txt ---- gmsh-4.13.1-source/CMakeLists.txt 2024-05-08 09:40:57.182520645 +0200 -+++ gmsh-4.13.1-source-new/CMakeLists.txt 2024-05-08 09:40:57.462519142 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt +--- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:09.131017940 +0200 ++++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:09.417023120 +0200 @@ -1714,6 +1714,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.1-source/CMakeLists.txt gmsh-4.13.1-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.13.1-source/src/graphics/CMakeLists.txt gmsh-4.13.1-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.13.1-source/src/graphics/CMakeLists.txt 2024-03-29 23:07:01.000000000 +0100 -+++ gmsh-4.13.1-source-new/src/graphics/CMakeLists.txt 2024-05-08 09:40:57.463519136 +0200 +diff -rupN --no-dereference gmsh-4.13.2-source/src/graphics/CMakeLists.txt gmsh-4.13.2-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.13.2-source/src/graphics/CMakeLists.txt 2024-06-04 06:53:30.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/graphics/CMakeLists.txt 2024-06-04 13:43:09.417023120 +0200 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 43bfc13..81140eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.13.1-source-fedora.tar.xz) = 95ebfc4649d1ca865bfad7d55b585fb0b2d18421b376bf3b42fd692f1789ae3c6d3006e62384dca7c95e73926c9624f75147aeece1719e53137af33f2e27b7ee +SHA512 (gmsh-4.13.2-source-fedora.tar.xz) = 16a4c60d0a509c9b5a3b329abd8dbb28d5494b100f5aaaa76e624f50a3c81116d51f7aed205a178b68cf4ebda632fa0b94a38ccf3afc7221599695fa74bfded9 From 27b529371b20030bba21e3a8bc5ddb237481cc08 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 14:03:20 +0200 Subject: [PATCH 24/46] Rebuilt for Python 3.13 --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index b13d5ee..12b837a 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 1%{?dist} +Release: 2%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sun Jun 09 2024 Python Maint - 4.13.2-2 +- Rebuilt for Python 3.13 + * Tue Jun 04 2024 Sandro Mani - 4.13.2-1 - Update to 4.13.2 From 164fe029d0736db30d166dd6a4f9e8fca312b0dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:50:54 +0000 Subject: [PATCH 25/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 12b837a..61a5743 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 2%{?dist} +Release: 3%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 4.13.2-2 - Rebuilt for Python 3.13 From a0652c93e2cde0a2b77fe5917b7b68bc4a2452c1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:25:04 -0600 Subject: [PATCH 26/46] Rebuild for hdf5 1.14.5 --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 61a5743..280bfdd 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 3%{?dist} +Release: 4%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Oct 25 2024 Orion Poplawski - 4.13.2-4 +- Rebuild for hdf5 1.14.5 + * Thu Jul 18 2024 Fedora Release Engineering - 4.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From bcef76041a72caa198382f797a02f13b5e04c3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 30 Oct 2024 19:52:45 +0000 Subject: [PATCH 27/46] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- gmsh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gmsh.spec b/gmsh.spec index 280bfdd..c0996f5 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -22,9 +22,9 @@ Release: 4%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} -# gmsh is GPLv2+ with exceptions, see LICENSE.txt +# gmsh is GPL-2.0-or-later WITH Gmsh-exception, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt -License: GPL-2.0-with-Gmsh-exception AND MIT +License: GPL-2.0-or-later WITH Gmsh-exception AND MIT URL: http://geuz.org/gmsh/ # Download source from http://geuz.org/gmsh/src/%%{name}-%%{version}-source.tgz # Delete contrib/blossom and contrib/mpeg_encode from source archive From c837ea7557ba8d15bdc13251e4a4551b04b1d7aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:32:01 +0000 Subject: [PATCH 28/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index c0996f5..ebe3c9f 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 4%{?dist} +Release: 5%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.13.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 25 2024 Orion Poplawski - 4.13.2-4 - Rebuild for hdf5 1.14.5 From aaaca2c0b199f70ac007b85a26213c751efc5dad Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 24 Jan 2025 11:04:14 +0100 Subject: [PATCH 29/46] Rebuild (cgnslib) --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index ebe3c9f..6bd45fb 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 5%{?dist} +Release: 6%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Jan 24 2025 Sandro Mani - 4.13.2-6 +- Rebuild (cgnslib) + * Thu Jan 16 2025 Fedora Release Engineering - 4.13.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f5aa030befe7e236746d5b113a889cadb19f29a7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Jan 2025 18:07:50 +0100 Subject: [PATCH 30/46] Rebuild (cgnslib) --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 6bd45fb..0e67fe2 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 6%{?dist} +Release: 7%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Jan 28 2025 Sandro Mani - 4.13.2-7 +- Rebuild (cgnslib) + * Fri Jan 24 2025 Sandro Mani - 4.13.2-6 - Rebuild (cgnslib) From c97049148ef20c09faaf8c651c31f1be187a5c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 3 Feb 2025 17:31:55 +0100 Subject: [PATCH 31/46] Rebuild for tcl/tk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 0e67fe2..a5b9379 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 7%{?dist} +Release: 8%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -409,6 +409,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Feb 3 2025 Jaroslav Škarvada - 4.13.2-8 +- Rebuild for tcl/tk + * Tue Jan 28 2025 Sandro Mani - 4.13.2-7 - Rebuild (cgnslib) From 6ce2ee12ad0d14ff7ddfd7c7204625482a9a75f0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 25 May 2025 00:48:55 +0200 Subject: [PATCH 32/46] Add gmsh-gcc15.patch --- gmsh-gcc15.patch | 25 +++++++++++++++++++++++++ gmsh.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gmsh-gcc15.patch diff --git a/gmsh-gcc15.patch b/gmsh-gcc15.patch new file mode 100644 index 0000000..9851aed --- /dev/null +++ b/gmsh-gcc15.patch @@ -0,0 +1,25 @@ +diff -rupN --no-dereference gmsh-4.13.2-source/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx gmsh-4.13.2-source-new/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx +--- gmsh-4.13.2-source/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx 2023-07-21 20:57:22.000000000 +0200 ++++ gmsh-4.13.2-source-new/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx 2025-05-25 00:31:04.555354732 +0200 +@@ -1,7 +1,7 @@ ++#include "hxt_omp.h" + extern "C" { + #include "hxt_mesh.h" + #include "hxt_tools.h" +-#include "hxt_omp.h" + #include "predicates.h" + } + +diff -rupN --no-dereference gmsh-4.13.2-source/src/mesh/meshGRegionHxt.cpp gmsh-4.13.2-source-new/src/mesh/meshGRegionHxt.cpp +--- gmsh-4.13.2-source/src/mesh/meshGRegionHxt.cpp 2024-06-04 06:53:31.000000000 +0200 ++++ gmsh-4.13.2-source-new/src/mesh/meshGRegionHxt.cpp 2025-05-25 00:31:04.555654116 +0200 +@@ -24,8 +24,8 @@ + + #if defined(HAVE_HXT) + +-extern "C" { + #include "hxt_omp.h" ++extern "C" { + #include "hxt_tetMesh.h" + #include "hxt_tetDelaunay.h" + } diff --git a/gmsh.spec b/gmsh.spec index a5b9379..bda0356 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 8%{?dist} +Release: 9%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -47,6 +47,9 @@ Patch5: gmsh_unbundle_gl2ps.patch Patch6: gmsh-cstdint.patch # Fix incompatible size_t* -> uint64_t* conversions Patch7: gmsh_uint64.patch +# Fix build failure with GCC15 +# https://gitlab.onelab.info/gmsh/gmsh/-/issues?show=eyJpaWQiOiIzMjc2IiwiZnVsbF9wYXRoIjoiZ21zaC9nbXNoIiwiaWQiOjQ0MTB9 +Patch8: gmsh-gcc15.patch BuildRequires: alglib-devel BuildRequires: ann-devel @@ -409,6 +412,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sat May 24 2025 Sandro Mani - 4.13.2-9 +- Add fix for GCC15 build failure + * Mon Feb 3 2025 Jaroslav Škarvada - 4.13.2-8 - Rebuild for tcl/tk From 513886e30f84167f7c16797ff9a0afa80fede9e3 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 27 May 2025 19:11:47 -0500 Subject: [PATCH 33/46] Rebuild for opencascade 7.9.1. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index bda0356..9e361f6 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 9%{?dist} +Release: 10%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -412,6 +412,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed May 28 2025 Richard Shaw - 4.13.2-10 +- Rebuild for opencascade 7.9.1. + * Sat May 24 2025 Sandro Mani - 4.13.2-9 - Add fix for GCC15 build failure From 977b97afd725063a10b90cfb84a91dc65339a1a6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 28 May 2025 19:01:35 -0500 Subject: [PATCH 34/46] Rebuild for opencascade 7.9.1. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 9e361f6..e9b25dd 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 10%{?dist} +Release: 11%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -412,6 +412,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu May 29 2025 Richard Shaw - 4.13.2-11 +- Rebuild for opencascade 7.9.1. + * Wed May 28 2025 Richard Shaw - 4.13.2-10 - Rebuild for opencascade 7.9.1. From d03d5b627a451bd59e82162b69d4ed438b3a10d9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 09:44:25 +0200 Subject: [PATCH 35/46] Rebuilt for Python 3.14 --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index e9b25dd..3c55452 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.13.2 -Release: 11%{?dist} +Release: 12%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -412,6 +412,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed Jun 04 2025 Python Maint - 4.13.2-12 +- Rebuilt for Python 3.14 + * Thu May 29 2025 Richard Shaw - 4.13.2-11 - Rebuild for opencascade 7.9.1. From 712c6a119fc162868a593a0ef6c51f1a02c60806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 4 Jun 2025 10:03:56 +0200 Subject: [PATCH 36/46] removed alglib from BuildRequires Seems alglib is not used any more by gmsh, so remove it from BuildRequires. --- gmsh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 3c55452..492e343 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -51,7 +51,6 @@ Patch7: gmsh_uint64.patch # https://gitlab.onelab.info/gmsh/gmsh/-/issues?show=eyJpaWQiOiIzMjc2IiwiZnVsbF9wYXRoIjoiZ21zaC9nbXNoIiwiaWQiOjQ0MTB9 Patch8: gmsh-gcc15.patch -BuildRequires: alglib-devel BuildRequires: ann-devel %if %{with flexiblas} BuildRequires: flexiblas-devel From 0a83798dcd8009217e1447e7b6b7e20895d7cb07 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 5 Jul 2025 13:58:37 +0200 Subject: [PATCH 37/46] Update to 4.14.0 --- .gitignore | 1 + gmsh-cstdint.patch | 11 --------- gmsh-gcc15.patch | 25 -------------------- gmsh.spec | 21 +++++++--------- gmsh_build.patch | 24 ------------------- gmsh_install.patch | 8 +++---- gmsh_julia.patch | 8 +++---- gmsh_med.patch | 24 +++++++++---------- gmsh_python.patch | 20 ++++++++-------- gmsh_uint64.patch | 50 --------------------------------------- gmsh_unbundle_gl2ps.patch | 14 +++++------ sources | 2 +- 12 files changed, 47 insertions(+), 161 deletions(-) delete mode 100644 gmsh-cstdint.patch delete mode 100644 gmsh-gcc15.patch delete mode 100644 gmsh_build.patch delete mode 100644 gmsh_uint64.patch diff --git a/.gitignore b/.gitignore index 79b05cc..5b3f9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /gmsh-4.13.0-source-fedora.tar.xz /gmsh-4.13.1-source-fedora.tar.xz /gmsh-4.13.2-source-fedora.tar.xz +/gmsh-4.14.0-source-fedora.tar.xz diff --git a/gmsh-cstdint.patch b/gmsh-cstdint.patch deleted file mode 100644 index e13d68c..0000000 --- a/gmsh-cstdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/src/mesh/meshGFacePack.cpp gmsh-4.13.2-source-new/src/mesh/meshGFacePack.cpp ---- gmsh-4.13.2-source/src/mesh/meshGFacePack.cpp 2024-06-04 06:53:31.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/mesh/meshGFacePack.cpp 2024-06-04 13:43:09.693028118 +0200 -@@ -5,6 +5,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/gmsh-gcc15.patch b/gmsh-gcc15.patch deleted file mode 100644 index 9851aed..0000000 --- a/gmsh-gcc15.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx gmsh-4.13.2-source-new/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx ---- gmsh-4.13.2-source/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx 2023-07-21 20:57:22.000000000 +0200 -+++ gmsh-4.13.2-source-new/contrib/hxt/tetBR/src/hxt_boundary_recovery.cxx 2025-05-25 00:31:04.555354732 +0200 -@@ -1,7 +1,7 @@ -+#include "hxt_omp.h" - extern "C" { - #include "hxt_mesh.h" - #include "hxt_tools.h" --#include "hxt_omp.h" - #include "predicates.h" - } - -diff -rupN --no-dereference gmsh-4.13.2-source/src/mesh/meshGRegionHxt.cpp gmsh-4.13.2-source-new/src/mesh/meshGRegionHxt.cpp ---- gmsh-4.13.2-source/src/mesh/meshGRegionHxt.cpp 2024-06-04 06:53:31.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/mesh/meshGRegionHxt.cpp 2025-05-25 00:31:04.555654116 +0200 -@@ -24,8 +24,8 @@ - - #if defined(HAVE_HXT) - --extern "C" { - #include "hxt_omp.h" -+extern "C" { - #include "hxt_tetMesh.h" - #include "hxt_tetDelaunay.h" - } diff --git a/gmsh.spec b/gmsh.spec index 492e343..84eec45 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -9,7 +9,7 @@ %endif %bcond_without mpich -%global sover 4.13 +%global sover 4.14 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_without flexiblas @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.13.2 -Release: 12%{?dist} +Version: 4.14.0 +Release: 1%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -39,17 +39,8 @@ Patch1: gmsh_med.patch Patch2: gmsh_julia.patch # Remove odd install of gmsh shared library Patch3: gmsh_install.patch -# Fix build error caused by include ordering -Patch4: gmsh_build.patch # Unbundle gl2ps -Patch5: gmsh_unbundle_gl2ps.patch -# Header fix for GCC 13 -Patch6: gmsh-cstdint.patch -# Fix incompatible size_t* -> uint64_t* conversions -Patch7: gmsh_uint64.patch -# Fix build failure with GCC15 -# https://gitlab.onelab.info/gmsh/gmsh/-/issues?show=eyJpaWQiOiIzMjc2IiwiZnVsbF9wYXRoIjoiZ21zaC9nbXNoIiwiaWQiOjQ0MTB9 -Patch8: gmsh-gcc15.patch +Patch4: gmsh_unbundle_gl2ps.patch BuildRequires: ann-devel %if %{with flexiblas} @@ -239,6 +230,7 @@ ls -1 | \ grep -v ^hxt$ | \ grep -v ^kbipack$ | \ grep -v ^onelab$ | \ + grep -v ^tinyobjloader$ | \ xargs rm -rf ) @@ -411,6 +403,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Jul 04 2025 Sandro Mani - 4.14.0-1 +- Update to 4.14.0 + * Wed Jun 04 2025 Python Maint - 4.13.2-12 - Rebuilt for Python 3.14 diff --git a/gmsh_build.patch b/gmsh_build.patch deleted file mode 100644 index d80193b..0000000 --- a/gmsh_build.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/src/fltk/helpWindow.cpp gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.2-source/src/fltk/helpWindow.cpp 2024-06-04 13:43:08.587008087 +0200 -+++ gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp 2024-06-04 13:43:09.135018012 +0200 -@@ -3,6 +3,12 @@ - // See the LICENSE.txt file in the Gmsh root directory for license information. - // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues. - -+#include "GmshConfig.h" -+ -+#if defined(HAVE_MED) -+#include -+#endif -+ - #include - #include - #include -@@ -11,7 +17,6 @@ - #include - #include - #include --#include "GmshConfig.h" - #include "FlGui.h" - #include "inputValue.h" - #include "helpWindow.h" diff --git a/gmsh_install.patch b/gmsh_install.patch index 4703c11..be3d88d 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt ---- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:08.858012995 +0200 -+++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.863013086 +0200 -@@ -279,7 +279,7 @@ if(ENABLE_RPATH) +diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt +--- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:28.933074150 +0200 ++++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.936958657 +0200 +@@ -278,7 +278,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 6d1f5d3..1137a39 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt ---- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:08.318003215 +0200 -+++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.592008178 +0200 -@@ -2004,7 +2004,7 @@ endif() +diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt +--- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:28.474781143 +0200 ++++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.708198878 +0200 +@@ -2041,7 +2041,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) install(FILES ${GMSH_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) diff --git a/gmsh_med.patch b/gmsh_med.patch index a9975b7..ebd578c 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/src/common/CommandLine.cpp gmsh-4.13.2-source-new/src/common/CommandLine.cpp ---- gmsh-4.13.2-source/src/common/CommandLine.cpp 2024-06-04 06:53:29.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/common/CommandLine.cpp 2024-06-04 13:43:08.323003306 +0200 +diff -rupN --no-dereference gmsh-4.14.0-source/src/common/CommandLine.cpp gmsh-4.14.0-source-new/src/common/CommandLine.cpp +--- gmsh-4.14.0-source/src/common/CommandLine.cpp 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/common/CommandLine.cpp 2025-07-04 17:01:28.479037007 +0200 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.2-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.13.2-source/src/fltk/helpWindow.cpp gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.13.2-source/src/fltk/helpWindow.cpp 2024-06-04 06:53:29.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/fltk/helpWindow.cpp 2024-06-04 13:43:08.323003306 +0200 +diff -rupN --no-dereference gmsh-4.14.0-source/src/fltk/helpWindow.cpp gmsh-4.14.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.14.0-source/src/fltk/helpWindow.cpp 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/fltk/helpWindow.cpp 2025-07-04 17:01:28.479393759 +0200 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.13.2-source/src/fltk/helpWindow.cpp gmsh-4.13 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.13.2-source/src/geo/GModelIO_MED.cpp gmsh-4.13.2-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.13.2-source/src/geo/GModelIO_MED.cpp 2024-06-04 06:53:30.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/geo/GModelIO_MED.cpp 2024-06-04 13:43:08.323003306 +0200 +diff -rupN --no-dereference gmsh-4.14.0-source/src/geo/GModelIO_MED.cpp gmsh-4.14.0-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.14.0-source/src/geo/GModelIO_MED.cpp 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/geo/GModelIO_MED.cpp 2025-07-04 17:01:28.479616410 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.13.2-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.13.2-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.13.2-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.13.2-source/src/post/PViewDataGModelIO_MED.cpp 2024-06-04 06:53:31.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/post/PViewDataGModelIO_MED.cpp 2024-06-04 13:43:08.324003324 +0200 +diff -rupN --no-dereference gmsh-4.14.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.14.0-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.14.0-source/src/post/PViewDataGModelIO_MED.cpp 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-07-04 17:01:28.479871407 +0200 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 72beafd..f38464c 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt ---- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 06:53:22.000000000 +0200 -+++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:08.039998180 +0200 -@@ -1986,6 +1986,8 @@ else() +diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt +--- gmsh-4.14.0-source/CMakeLists.txt 2025-07-02 17:39:09.000000000 +0200 ++++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.234836912 +0200 +@@ -2001,6 +2001,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -9,8 +9,8 @@ diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source + # mark targets as optional so we can install them separately if needed # (e.g. "make lib" or "make shared" followed by "make install/fast") - install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) -@@ -1997,14 +1999,14 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D + install(TARGETS gmsh +@@ -2034,14 +2036,14 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHAR endif() if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) @@ -28,10 +28,10 @@ diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.13.2-source/src/common/GmshMessage.cpp gmsh-4.13.2-source-new/src/common/GmshMessage.cpp ---- gmsh-4.13.2-source/src/common/GmshMessage.cpp 2024-06-04 07:36:27.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/common/GmshMessage.cpp 2024-06-04 13:43:08.040998199 +0200 -@@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar +diff -rupN --no-dereference gmsh-4.14.0-source/src/common/GmshMessage.cpp gmsh-4.14.0-source-new/src/common/GmshMessage.cpp +--- gmsh-4.14.0-source/src/common/GmshMessage.cpp 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/common/GmshMessage.cpp 2025-07-04 17:01:28.235335380 +0200 +@@ -177,14 +177,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_uint64.patch b/gmsh_uint64.patch deleted file mode 100644 index 286e013..0000000 --- a/gmsh_uint64.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c gmsh-4.13.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c ---- gmsh-4.13.2-source/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-06-04 06:53:26.000000000 +0200 -+++ gmsh-4.13.2-source-new/contrib/hxt/tetMesh/src/hxt_tetRefine.c 2024-06-04 13:43:09.971033153 +0200 -@@ -297,11 +297,11 @@ static uint64_t* scanbsearch(uint64_t* a - * - startTet[maxThreads] = mesh->tetrahedra.num - * - `startPt[t+1] - startPt[t]` gives how many point will be created by thread t - */ --static HXTStatus balanceRefineWork(HXTMesh* mesh, uint32_t* startPt, size_t* startTet, int maxThreads) -+static HXTStatus balanceRefineWork(HXTMesh* mesh, uint32_t* startPt, uint64_t* startTet, int maxThreads) - { -- size_t* scan; -+ uint64_t* scan; - uint32_t ptPerThreadGoal; -- HXT_CHECK( hxtAlignedMalloc(&scan, sizeof(size_t) * mesh->tetrahedra.num) ); -+ HXT_CHECK( hxtAlignedMalloc(&scan, sizeof(uint64_t) * mesh->tetrahedra.num) ); - - #pragma omp parallel num_threads(maxThreads) - { -@@ -318,9 +318,9 @@ static HXTStatus balanceRefineWork(HXTMe - #pragma omp single - { - // we do a simple prefix sum -- size_t sum = 0; -+ uint32_t sum = 0; - for(int t=0; ttetrahedra.num; i++) { -- size_t inc = scan[i]; -+ uint64_t inc = scan[i]; - scan[i] = s; - s += inc; - } - -- size_t scanToFind = threadID * ptPerThreadGoal; -+ uint64_t scanToFind = threadID * ptPerThreadGoal; - - // we want to find i such that scan[i] = scanToFind. - // we do a simple binary search in the prefix scan array to find `i` -- size_t* pfnd = scanbsearch(scan, scanToFind, mesh->tetrahedra.num); -+ uint64_t* pfnd = scanbsearch(scan, scanToFind, mesh->tetrahedra.num); - startTet[threadID] = pfnd - scan; - if(startTet[threadID] < mesh->tetrahedra.num) - startPt[threadID] = *pfnd; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index ff8401c..f438c25 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source-new/CMakeLists.txt ---- gmsh-4.13.2-source/CMakeLists.txt 2024-06-04 13:43:09.131017940 +0200 -+++ gmsh-4.13.2-source-new/CMakeLists.txt 2024-06-04 13:43:09.417023120 +0200 -@@ -1714,6 +1714,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB +diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt +--- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:29.161252918 +0200 ++++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:29.394753418 +0200 +@@ -1728,6 +1728,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.13.2-source/CMakeLists.txt gmsh-4.13.2-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.13.2-source/src/graphics/CMakeLists.txt gmsh-4.13.2-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.13.2-source/src/graphics/CMakeLists.txt 2024-06-04 06:53:30.000000000 +0200 -+++ gmsh-4.13.2-source-new/src/graphics/CMakeLists.txt 2024-06-04 13:43:09.417023120 +0200 +diff -rupN --no-dereference gmsh-4.14.0-source/src/graphics/CMakeLists.txt gmsh-4.14.0-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.14.0-source/src/graphics/CMakeLists.txt 2025-07-02 17:39:10.000000000 +0200 ++++ gmsh-4.14.0-source-new/src/graphics/CMakeLists.txt 2025-07-04 17:01:29.395212058 +0200 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index 81140eb..effd372 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.13.2-source-fedora.tar.xz) = 16a4c60d0a509c9b5a3b329abd8dbb28d5494b100f5aaaa76e624f50a3c81116d51f7aed205a178b68cf4ebda632fa0b94a38ccf3afc7221599695fa74bfded9 +SHA512 (gmsh-4.14.0-source-fedora.tar.xz) = 4c3a3e473b9b344fbe549a722899948b132f48073d1cf9d764e06f98f42ee8ccc855ace289d2baf5b17d77f6face22c62f68a6bcc9c7f6edf2b0a50b48d79240 From 1bad20daa241c3dd2280108b5e050f260adc61ab Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 17 Jul 2025 19:33:28 +0200 Subject: [PATCH 38/46] Use %cmake_build instead of make --- gmsh.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gmsh.spec b/gmsh.spec index 84eec45..acedf73 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.14.0 -Release: 1%{?dist} +Release: 2%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -61,7 +61,6 @@ BuildRequires: hdf5-devel BuildRequires: libjpeg-turbo-devel BuildRequires: liblbfgs-devel BuildRequires: libpng-devel -BuildRequires: make BuildRequires: mathex-devel BuildRequires: med-devel BuildRequires: mesa-libGLU-devel @@ -295,7 +294,7 @@ export CXX=mpicxx %endif # Built html documentation -make -C %{_target_platform} html +%cmake_build --target html # Fix to create correct debuginfo cp -a src/parser/Gmsh.* %{_target_platform} @@ -403,6 +402,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Thu Jul 17 2025 Sandro Mani - 4.14.0-2 +- Use %%cmake_build instead of make + * Fri Jul 04 2025 Sandro Mani - 4.14.0-1 - Update to 4.14.0 From b549eab6cad7247d679087c3a549d814f950a46b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:37:17 +0000 Subject: [PATCH 39/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index acedf73..a5796b2 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.14.0 -Release: 2%{?dist} +Release: 3%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -402,6 +402,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Sandro Mani - 4.14.0-2 - Use %%cmake_build instead of make From 06975b68744dd56732004146267ac21c75cb9c23 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:49:26 +0200 Subject: [PATCH 40/46] Rebuilt for Python 3.14.0rc2 bytecode --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index a5796b2..10a2458 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.14.0 -Release: 3%{?dist} +Release: 4%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -402,6 +402,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Aug 15 2025 Python Maint - 4.14.0-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 4.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 10609fd0b4270a2c6ac98ab73a4301af7c07dd30 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 2 Sep 2025 14:34:06 +0200 Subject: [PATCH 41/46] Update to 4.14.1 --- .gitignore | 1 + gmsh.spec | 7 +++++-- gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 24 ++++++++++++------------ gmsh_python.patch | 12 ++++++------ gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 8 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 5b3f9ed..a7761a7 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /gmsh-4.13.1-source-fedora.tar.xz /gmsh-4.13.2-source-fedora.tar.xz /gmsh-4.14.0-source-fedora.tar.xz +/gmsh-4.14.1-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index 10a2458..0e6afd2 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.14.0 -Release: 4%{?dist} +Version: 4.14.1 +Release: 1%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -402,6 +402,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Tue Sep 02 2025 Sandro Mani - 4.14.1-1 +- Update to 4.14.1 + * Fri Aug 15 2025 Python Maint - 4.14.0-4 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/gmsh_install.patch b/gmsh_install.patch index be3d88d..cd3370c 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt ---- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:28.933074150 +0200 -+++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.936958657 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt +--- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:42.435707935 +0200 ++++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.439022497 +0200 @@ -278,7 +278,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 1137a39..2b936f7 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt ---- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:28.474781143 +0200 -+++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.708198878 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt +--- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:41.955321611 +0200 ++++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.213216407 +0200 @@ -2041,7 +2041,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index ebd578c..9390b3a 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.0-source/src/common/CommandLine.cpp gmsh-4.14.0-source-new/src/common/CommandLine.cpp ---- gmsh-4.14.0-source/src/common/CommandLine.cpp 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/common/CommandLine.cpp 2025-07-04 17:01:28.479037007 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/common/CommandLine.cpp gmsh-4.14.1-source-new/src/common/CommandLine.cpp +--- gmsh-4.14.1-source/src/common/CommandLine.cpp 2025-07-24 12:35:20.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/common/CommandLine.cpp 2025-09-02 14:32:41.960203688 +0200 @@ -42,7 +42,7 @@ #endif @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.14.0-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.14.0-source/src/fltk/helpWindow.cpp gmsh-4.14.0-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.14.0-source/src/fltk/helpWindow.cpp 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/fltk/helpWindow.cpp 2025-07-04 17:01:28.479393759 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/fltk/helpWindow.cpp gmsh-4.14.1-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.14.1-source/src/fltk/helpWindow.cpp 2025-09-02 11:38:17.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/fltk/helpWindow.cpp 2025-09-02 14:32:41.960660399 +0200 @@ -36,7 +36,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.14.0-source/src/fltk/helpWindow.cpp gmsh-4.14 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.14.0-source/src/geo/GModelIO_MED.cpp gmsh-4.14.0-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.14.0-source/src/geo/GModelIO_MED.cpp 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/geo/GModelIO_MED.cpp 2025-07-04 17:01:28.479616410 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/geo/GModelIO_MED.cpp gmsh-4.14.1-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.14.1-source/src/geo/GModelIO_MED.cpp 2025-07-24 12:35:20.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/geo/GModelIO_MED.cpp 2025-09-02 14:32:41.960938701 +0200 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.14.0-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.14.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.14.0-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.14.0-source/src/post/PViewDataGModelIO_MED.cpp 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-07-04 17:01:28.479871407 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.14.1-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.14.1-source/src/post/PViewDataGModelIO_MED.cpp 2025-07-24 12:35:21.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-09-02 14:32:41.961256864 +0200 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index f38464c..06dcb3a 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt ---- gmsh-4.14.0-source/CMakeLists.txt 2025-07-02 17:39:09.000000000 +0200 -+++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:28.234836912 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt +--- gmsh-4.14.1-source/CMakeLists.txt 2025-08-30 13:14:13.000000000 +0200 ++++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:41.711919812 +0200 @@ -2001,6 +2001,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.14.0-source/src/common/GmshMessage.cpp gmsh-4.14.0-source-new/src/common/GmshMessage.cpp ---- gmsh-4.14.0-source/src/common/GmshMessage.cpp 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/common/GmshMessage.cpp 2025-07-04 17:01:28.235335380 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/common/GmshMessage.cpp gmsh-4.14.1-source-new/src/common/GmshMessage.cpp +--- gmsh-4.14.1-source/src/common/GmshMessage.cpp 2025-08-19 12:22:31.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/common/GmshMessage.cpp 2025-09-02 14:32:41.712447178 +0200 @@ -177,14 +177,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index f438c25..1c7a5c1 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source-new/CMakeLists.txt ---- gmsh-4.14.0-source/CMakeLists.txt 2025-07-04 17:01:29.161252918 +0200 -+++ gmsh-4.14.0-source-new/CMakeLists.txt 2025-07-04 17:01:29.394753418 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt +--- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:42.662049508 +0200 ++++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.665923375 +0200 @@ -1728,6 +1728,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.14.0-source/CMakeLists.txt gmsh-4.14.0-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.14.0-source/src/graphics/CMakeLists.txt gmsh-4.14.0-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.14.0-source/src/graphics/CMakeLists.txt 2025-07-02 17:39:10.000000000 +0200 -+++ gmsh-4.14.0-source-new/src/graphics/CMakeLists.txt 2025-07-04 17:01:29.395212058 +0200 +diff -rupN --no-dereference gmsh-4.14.1-source/src/graphics/CMakeLists.txt gmsh-4.14.1-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.14.1-source/src/graphics/CMakeLists.txt 2025-07-24 12:35:21.000000000 +0200 ++++ gmsh-4.14.1-source-new/src/graphics/CMakeLists.txt 2025-09-02 14:32:42.666317929 +0200 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index effd372..b2ba876 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.14.0-source-fedora.tar.xz) = 4c3a3e473b9b344fbe549a722899948b132f48073d1cf9d764e06f98f42ee8ccc855ace289d2baf5b17d77f6face22c62f68a6bcc9c7f6edf2b0a50b48d79240 +SHA512 (gmsh-4.14.1-source-fedora.tar.xz) = a7f8697af921f8739aa69158581c064c7209daf58c2a48f30950b449edc3cf7c4453a665ab698f10c57211c2baec96544dbc56aee4ac62b8dde1629297b65ce6 From 33029bd74aeb1b1a31b9c4a412b2644c0a6cc11e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:19:16 +0200 Subject: [PATCH 42/46] Rebuilt for Python 3.14.0rc3 bytecode --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 0e6afd2..664da70 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -18,7 +18,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.14.1 -Release: 1%{?dist} +Release: 2%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -402,6 +402,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Sep 19 2025 Python Maint - 4.14.1-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Tue Sep 02 2025 Sandro Mani - 4.14.1-1 - Update to 4.14.1 From 9abc50053e73dd2b27d997ca332a2e551c42753c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 2 Nov 2025 07:27:34 -0600 Subject: [PATCH 43/46] Add conditional for optional dependency gmm which is retired. Update command for icon conversion. --- gmsh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 664da70..adee027 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -55,7 +55,10 @@ BuildRequires: desktop-file-utils BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: gcc-gfortran +# gmm is retired in Fedora +%if 0%{?fedora} < 44 BuildRequires: gmm-devel +%endif BuildRequires: gmp-devel BuildRequires: hdf5-devel BuildRequires: libjpeg-turbo-devel @@ -322,7 +325,7 @@ cp -a src/parser/Gmsh.* %{_target_platform}-mpich find %{buildroot} -type f -name libgmsh.a -exec rm -f {} \; # Install icon and .desktop file -convert -scale 128 utils/icons/gmsh.png icon_128x128.png +magick -scale 128 utils/icons/gmsh.png icon_128x128.png install -Dpm 0644 icon_128x128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} From 138bd36c801923e90983642cecb3006c039e5522 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 16 Nov 2025 14:01:30 +0100 Subject: [PATCH 44/46] Update to 4.15.0 --- .gitignore | 1 + gmsh.spec | 31 ++++++++++++++++--------------- gmsh_gmm.patch | 22 ++++++++++++++++++++++ gmsh_install.patch | 6 +++--- gmsh_julia.patch | 6 +++--- gmsh_med.patch | 26 +++++++++++++------------- gmsh_python.patch | 12 ++++++------ gmsh_unbundle_gl2ps.patch | 12 ++++++------ sources | 2 +- 9 files changed, 71 insertions(+), 47 deletions(-) create mode 100644 gmsh_gmm.patch diff --git a/.gitignore b/.gitignore index a7761a7..2d41628 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /gmsh-4.13.2-source-fedora.tar.xz /gmsh-4.14.0-source-fedora.tar.xz /gmsh-4.14.1-source-fedora.tar.xz +/gmsh-4.15.0-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index adee027..1e95216 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -9,7 +9,7 @@ %endif %bcond_without mpich -%global sover 4.14 +%global sover 4.15 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %bcond_without flexiblas @@ -17,8 +17,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.14.1 -Release: 2%{?dist} +Version: 4.15.0 +Release: 1%{?dist} # MPI not available on i686 ExcludeArch: %{ix86} @@ -41,6 +41,8 @@ Patch2: gmsh_julia.patch Patch3: gmsh_install.patch # Unbundle gl2ps Patch4: gmsh_unbundle_gl2ps.patch +# Make gmm use superlu +Patch5: gmsh_gmm.patch BuildRequires: ann-devel %if %{with flexiblas} @@ -48,7 +50,6 @@ BuildRequires: flexiblas-devel %else BuildRequires: blas-devel, lapack-devel %endif -BuildRequires: eigen3-devel BuildRequires: cgnslib-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -72,6 +73,7 @@ BuildRequires: netgen-mesher-devel-private BuildRequires: opencascade-devel BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: SuperLU-devel BuildRequires: voro++-devel BuildRequires: zlib-devel BuildRequires: texinfo @@ -221,10 +223,12 @@ cp contrib/Netgen/nglib_gmsh.h contrib/Netgen/nglib_gmsh.cpp src/mesh # hxt: see contrib/hxt/CREDITS.txt # kbipack: Source not available on the net anymore # onelab: gmsh internal module +# WinslowUntangler: gmsh internal module (?) ( cd contrib; ls -1 | \ grep -v ^bamg$ | \ + grep -v ^blossom$ | \ grep -v ^DiscreteIntegration$ | \ grep -v ^MeshOptimizer$ | \ grep -v ^HighOrderMeshOptimizer$ | \ @@ -233,6 +237,7 @@ ls -1 | \ grep -v ^kbipack$ | \ grep -v ^onelab$ | \ grep -v ^tinyobjloader$ | \ + grep -v ^WinslowUntangler$ | \ xargs rm -rf ) @@ -247,18 +252,11 @@ gmsh_cmake_args="\ -DENABLE_BUILD_LIB=YES \ -DENABLE_BUILD_SHARED=YES \ -DENABLE_BUILD_DYNAMIC=YES \ - -DENABLE_MPEG_ENCODE=NO \ - -DENABLE_METIS=YES \ - -DENABLE_BLOSSOM=NO \ - -DENABLE_CGNS=YES \ - -DENABLE_MED=YES \ - -DENABLE_EIGEN=YES \ - -DEIGEN_INC=%{_includedir}/eigen3 \ - -DENABLE_OCC=YES" + -DENABLE_MPEG_ENCODE=NO" ### serial version ### %define _vpath_builddir %{_target_platform} -%cmake .. \ +%cmake \ -DENABLE_OPENMP=ON \ $gmsh_cmake_args @@ -269,7 +267,7 @@ gmsh_cmake_args="\ %{_openmpi_load} export CXX=mpicxx %define _vpath_builddir %{_target_platform}-openmpi -%cmake .. \ +%cmake \ -DENABLE_MPI=YES \ -DCMAKE_INSTALL_BINDIR=$MPI_BIN \ -DCMAKE_INSTALL_LIBDIR=$MPI_LIB \ @@ -285,7 +283,7 @@ export CXX=mpicxx %{_mpich_load} export CXX=mpicxx %define _vpath_builddir %{_target_platform}-mpich -%cmake .. \ +%cmake \ -DENABLE_MPI=YES \ -DCMAKE_INSTALL_BINDIR=$MPI_BIN \ -DCMAKE_INSTALL_LIBDIR=$MPI_LIB \ @@ -405,6 +403,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Sun Oct 26 2025 Sandro Mani - 4.15.0-1 +- Update to 4.15.0 + * Fri Sep 19 2025 Python Maint - 4.14.1-2 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/gmsh_gmm.patch b/gmsh_gmm.patch new file mode 100644 index 0000000..271327e --- /dev/null +++ b/gmsh_gmm.patch @@ -0,0 +1,22 @@ +diff -rupN gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt +--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:12:00.997452631 +0100 ++++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 13:18:32.590269286 +0100 +@@ -1271,6 +1271,18 @@ if(HAVE_SOLVER) + if(ENABLE_GMM) # use GMM/MUMPS interface + add_definitions(-DGMM_USES_MUMPS) + endif() ++ else() ++ if(ENABLE_GMM) # use GMM/MUMPS interface ++ add_definitions(-DGMM_USES_SUPERLU -DGMM_NO_SUPERLU_INCLUDE_SUBDIR) ++ find_path(SUPERLU_INC "slu_util.h" PATH_SUFFIXES SuperLU) ++ include_directories(${SUPERLU_INC}) ++ endif() ++ endif() ++ else() ++ if(ENABLE_GMM) # use GMM/MUMPS interface ++ add_definitions(-DGMM_USES_SUPERLU -DGMM_NO_SUPERLU_INCLUDE_SUBDIR) ++ find_path(SUPERLU_INC "slu_util.h" PATH_SUFFIXES SuperLU) ++ include_directories(${SUPERLU_INC}) + endif() + endif() + diff --git a/gmsh_install.patch b/gmsh_install.patch index cd3370c..5e02993 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt ---- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:42.435707935 +0200 -+++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.439022497 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt +--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.706154249 +0100 ++++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.710717577 +0100 @@ -278,7 +278,7 @@ if(ENABLE_RPATH) # when building, don't use the install RPATH already (but later on when # installing) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 2b936f7..90c37cf 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt ---- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:41.955321611 +0200 -+++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.213216407 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt +--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.209672907 +0100 ++++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.455854462 +0100 @@ -2041,7 +2041,7 @@ endif() if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION ${GMSH_INC}) diff --git a/gmsh_med.patch b/gmsh_med.patch index 9390b3a..696ca1b 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.1-source/src/common/CommandLine.cpp gmsh-4.14.1-source-new/src/common/CommandLine.cpp ---- gmsh-4.14.1-source/src/common/CommandLine.cpp 2025-07-24 12:35:20.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/common/CommandLine.cpp 2025-09-02 14:32:41.960203688 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/src/common/CommandLine.cpp gmsh-4.15.0-source-new/src/common/CommandLine.cpp +--- gmsh-4.15.0-source/src/common/CommandLine.cpp 2025-10-01 16:39:02.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/common/CommandLine.cpp 2025-11-16 12:11:30.214030834 +0100 @@ -42,7 +42,7 @@ #endif @@ -10,10 +10,10 @@ diff -rupN --no-dereference gmsh-4.14.1-source/src/common/CommandLine.cpp gmsh-4 #endif #if defined(HAVE_POST) -diff -rupN --no-dereference gmsh-4.14.1-source/src/fltk/helpWindow.cpp gmsh-4.14.1-source-new/src/fltk/helpWindow.cpp ---- gmsh-4.14.1-source/src/fltk/helpWindow.cpp 2025-09-02 11:38:17.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/fltk/helpWindow.cpp 2025-09-02 14:32:41.960660399 +0200 -@@ -36,7 +36,7 @@ +diff -rupN --no-dereference gmsh-4.15.0-source/src/fltk/helpWindow.cpp gmsh-4.15.0-source-new/src/fltk/helpWindow.cpp +--- gmsh-4.15.0-source/src/fltk/helpWindow.cpp 2025-10-01 16:39:02.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/fltk/helpWindow.cpp 2025-11-16 12:11:30.214367145 +0100 +@@ -37,7 +37,7 @@ #endif #if defined(HAVE_MED) @@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.14.1-source/src/fltk/helpWindow.cpp gmsh-4.14 #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN --no-dereference gmsh-4.14.1-source/src/geo/GModelIO_MED.cpp gmsh-4.14.1-source-new/src/geo/GModelIO_MED.cpp ---- gmsh-4.14.1-source/src/geo/GModelIO_MED.cpp 2025-07-24 12:35:20.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/geo/GModelIO_MED.cpp 2025-09-02 14:32:41.960938701 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/src/geo/GModelIO_MED.cpp gmsh-4.15.0-source-new/src/geo/GModelIO_MED.cpp +--- gmsh-4.15.0-source/src/geo/GModelIO_MED.cpp 2025-10-01 16:39:02.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/geo/GModelIO_MED.cpp 2025-11-16 12:11:30.214658519 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.14.1-source/src/geo/GModelIO_MED.cpp gmsh-4.1 #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN --no-dereference gmsh-4.14.1-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.14.1-source-new/src/post/PViewDataGModelIO_MED.cpp ---- gmsh-4.14.1-source/src/post/PViewDataGModelIO_MED.cpp 2025-07-24 12:35:21.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-09-02 14:32:41.961256864 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/src/post/PViewDataGModelIO_MED.cpp gmsh-4.15.0-source-new/src/post/PViewDataGModelIO_MED.cpp +--- gmsh-4.15.0-source/src/post/PViewDataGModelIO_MED.cpp 2025-10-01 16:39:03.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/post/PViewDataGModelIO_MED.cpp 2025-11-16 12:11:30.214886156 +0100 @@ -11,7 +11,7 @@ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 06dcb3a..75cfbb1 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt ---- gmsh-4.14.1-source/CMakeLists.txt 2025-08-30 13:14:13.000000000 +0200 -+++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:41.711919812 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt +--- gmsh-4.15.0-source/CMakeLists.txt 2025-10-25 17:09:26.000000000 +0200 ++++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:29.982761471 +0100 @@ -2001,6 +2001,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -28,9 +28,9 @@ diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen -diff -rupN --no-dereference gmsh-4.14.1-source/src/common/GmshMessage.cpp gmsh-4.14.1-source-new/src/common/GmshMessage.cpp ---- gmsh-4.14.1-source/src/common/GmshMessage.cpp 2025-08-19 12:22:31.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/common/GmshMessage.cpp 2025-09-02 14:32:41.712447178 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/src/common/GmshMessage.cpp gmsh-4.15.0-source-new/src/common/GmshMessage.cpp +--- gmsh-4.15.0-source/src/common/GmshMessage.cpp 2025-10-01 16:39:02.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/common/GmshMessage.cpp 2025-11-16 12:11:29.983375719 +0100 @@ -177,14 +177,6 @@ void Msg::Initialize(int argc, char **ar if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size()) CTX::instance()->exeFileName = _commandLineArgs[0]; diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch index 1c7a5c1..0c0047d 100644 --- a/gmsh_unbundle_gl2ps.patch +++ b/gmsh_unbundle_gl2ps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source-new/CMakeLists.txt ---- gmsh-4.14.1-source/CMakeLists.txt 2025-09-02 14:32:42.662049508 +0200 -+++ gmsh-4.14.1-source-new/CMakeLists.txt 2025-09-02 14:32:42.665923375 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source-new/CMakeLists.txt +--- gmsh-4.15.0-source/CMakeLists.txt 2025-11-16 12:11:30.943987998 +0100 ++++ gmsh-4.15.0-source-new/CMakeLists.txt 2025-11-16 12:11:30.948218140 +0100 @@ -1728,6 +1728,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB endif() endif() @@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.14.1-source/CMakeLists.txt gmsh-4.14.1-source # Linux-specific linker options if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(HAVE_OCC) -diff -rupN --no-dereference gmsh-4.14.1-source/src/graphics/CMakeLists.txt gmsh-4.14.1-source-new/src/graphics/CMakeLists.txt ---- gmsh-4.14.1-source/src/graphics/CMakeLists.txt 2025-07-24 12:35:21.000000000 +0200 -+++ gmsh-4.14.1-source-new/src/graphics/CMakeLists.txt 2025-09-02 14:32:42.666317929 +0200 +diff -rupN --no-dereference gmsh-4.15.0-source/src/graphics/CMakeLists.txt gmsh-4.15.0-source-new/src/graphics/CMakeLists.txt +--- gmsh-4.15.0-source/src/graphics/CMakeLists.txt 2025-10-01 16:39:02.000000000 +0200 ++++ gmsh-4.15.0-source-new/src/graphics/CMakeLists.txt 2025-11-16 12:11:30.948782419 +0100 @@ -15,7 +15,6 @@ set(SRC drawScales.cpp drawGraph2d.cpp diff --git a/sources b/sources index b2ba876..753782a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.14.1-source-fedora.tar.xz) = a7f8697af921f8739aa69158581c064c7209daf58c2a48f30950b449edc3cf7c4453a665ab698f10c57211c2baec96544dbc56aee4ac62b8dde1629297b65ce6 +SHA512 (gmsh-4.15.0-source-fedora.tar.xz) = eac4f6e8cd342ec07e1a83cae966d81716e1d158398ed930c82322b61785f8ab38c84ec07efc91f7be523d872e3331e1a64ce81b20a8c899a82107fab9834add From bbe788dd6089ad7a3a39f2f6126bf5b60cf9eba5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 16 Nov 2025 14:02:28 +0100 Subject: [PATCH 45/46] Drop gmm conditional, gmm has been unretired --- gmsh.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/gmsh.spec b/gmsh.spec index 1e95216..9ea3f57 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -56,10 +56,7 @@ BuildRequires: desktop-file-utils BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: gcc-gfortran -# gmm is retired in Fedora -%if 0%{?fedora} < 44 BuildRequires: gmm-devel -%endif BuildRequires: gmp-devel BuildRequires: hdf5-devel BuildRequires: libjpeg-turbo-devel From 8c7372ea35a3f6fb0c09727272cff9fec8642f8d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 16 Nov 2025 14:39:50 +0100 Subject: [PATCH 46/46] Fix magick args to generate icon_128x128.png --- gmsh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmsh.spec b/gmsh.spec index 9ea3f57..f1597f5 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -320,7 +320,7 @@ cp -a src/parser/Gmsh.* %{_target_platform}-mpich find %{buildroot} -type f -name libgmsh.a -exec rm -f {} \; # Install icon and .desktop file -magick -scale 128 utils/icons/gmsh.png icon_128x128.png +magick utils/icons/gmsh.png -scale 128 icon_128x128.png install -Dpm 0644 icon_128x128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}