Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d17d245b5 | ||
|
|
ba41ef20bd |
12 changed files with 153 additions and 158 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -72,9 +72,3 @@
|
|||
/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
|
||||
/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
|
||||
/gmsh-4.15.0-source-fedora.tar.xz
|
||||
|
|
|
|||
11
gmsh-cstdint.patch
Normal file
11
gmsh-cstdint.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
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
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <cstdint>
|
||||
#include <queue>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
120
gmsh.spec
120
gmsh.spec
|
|
@ -9,7 +9,7 @@
|
|||
%endif
|
||||
%bcond_without mpich
|
||||
|
||||
%global sover 4.15
|
||||
%global sover 4.12
|
||||
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||
%bcond_without flexiblas
|
||||
|
|
@ -17,14 +17,12 @@
|
|||
|
||||
Name: gmsh
|
||||
Summary: A three-dimensional finite element mesh generator
|
||||
Version: 4.15.0
|
||||
Release: 1%{?dist}
|
||||
# MPI not available on i686
|
||||
ExcludeArch: %{ix86}
|
||||
Version: 4.12.2
|
||||
Release: 2%{?dist}
|
||||
|
||||
# gmsh is GPL-2.0-or-later WITH Gmsh-exception, see LICENSE.txt
|
||||
# gmsh is GPLv2+ with exceptions, see LICENSE.txt
|
||||
# contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt
|
||||
License: GPL-2.0-or-later WITH Gmsh-exception 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
|
||||
|
|
@ -39,17 +37,23 @@ 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
|
||||
Patch4: gmsh_unbundle_gl2ps.patch
|
||||
# Make gmm use superlu
|
||||
Patch5: gmsh_gmm.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
|
||||
%if %{with flexiblas}
|
||||
BuildRequires: flexiblas-devel
|
||||
%else
|
||||
BuildRequires: blas-devel, lapack-devel
|
||||
%endif
|
||||
BuildRequires: eigen3-devel
|
||||
BuildRequires: cgnslib-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -62,6 +66,7 @@ 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
|
||||
|
|
@ -70,7 +75,6 @@ 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
|
||||
|
|
@ -220,12 +224,10 @@ 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,8 +235,6 @@ ls -1 | \
|
|||
grep -v ^hxt$ | \
|
||||
grep -v ^kbipack$ | \
|
||||
grep -v ^onelab$ | \
|
||||
grep -v ^tinyobjloader$ | \
|
||||
grep -v ^WinslowUntangler$ | \
|
||||
xargs rm -rf
|
||||
)
|
||||
|
||||
|
|
@ -249,11 +249,18 @@ gmsh_cmake_args="\
|
|||
-DENABLE_BUILD_LIB=YES \
|
||||
-DENABLE_BUILD_SHARED=YES \
|
||||
-DENABLE_BUILD_DYNAMIC=YES \
|
||||
-DENABLE_MPEG_ENCODE=NO"
|
||||
-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"
|
||||
|
||||
### serial version ###
|
||||
%define _vpath_builddir %{_target_platform}
|
||||
%cmake \
|
||||
%cmake .. \
|
||||
-DENABLE_OPENMP=ON \
|
||||
$gmsh_cmake_args
|
||||
|
||||
|
|
@ -264,7 +271,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 \
|
||||
|
|
@ -280,7 +287,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 \
|
||||
|
|
@ -292,7 +299,7 @@ export CXX=mpicxx
|
|||
%endif
|
||||
|
||||
# Built html documentation
|
||||
%cmake_build --target html
|
||||
make -C %{_target_platform} html
|
||||
|
||||
# Fix to create correct debuginfo
|
||||
cp -a src/parser/Gmsh.* %{_target_platform}
|
||||
|
|
@ -320,7 +327,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 utils/icons/gmsh.png -scale 128 icon_128x128.png
|
||||
convert -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}
|
||||
|
||||
|
|
@ -400,79 +407,10 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Oct 26 2025 Sandro Mani <manisandro@gmail.com> - 4.15.0-1
|
||||
- Update to 4.15.0
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.14.1-2
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Tue Sep 02 2025 Sandro Mani <manisandro@gmail.com> - 4.14.1-1
|
||||
- Update to 4.14.1
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.14.0-4
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jul 17 2025 Sandro Mani <manisandro@gmail.com> - 4.14.0-2
|
||||
- Use %%cmake_build instead of make
|
||||
|
||||
* Fri Jul 04 2025 Sandro Mani <manisandro@gmail.com> - 4.14.0-1
|
||||
- Update to 4.14.0
|
||||
|
||||
* Wed Jun 04 2025 Python Maint <python-maint@redhat.com> - 4.13.2-12
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Thu May 29 2025 Richard Shaw <hobbes1069@gmail.com> - 4.13.2-11
|
||||
- Rebuild for opencascade 7.9.1.
|
||||
|
||||
* Wed May 28 2025 Richard Shaw <hobbes1069@gmail.com> - 4.13.2-10
|
||||
- Rebuild for opencascade 7.9.1.
|
||||
|
||||
* Sat May 24 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-9
|
||||
- Add fix for GCC15 build failure
|
||||
|
||||
* Mon Feb 3 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.13.2-8
|
||||
- Rebuild for tcl/tk
|
||||
|
||||
* Tue Jan 28 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-7
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Fri Jan 24 2025 Sandro Mani <manisandro@gmail.com> - 4.13.2-6
|
||||
- Rebuild (cgnslib)
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 4.13.2-4
|
||||
- Rebuild for hdf5 1.14.5
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 4.13.2-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Tue Jun 04 2024 Sandro Mani <manisandro@gmail.com> - 4.13.2-1
|
||||
- Update to 4.13.2
|
||||
|
||||
* Sun Jun 02 2024 Richard Shaw <hobbes1069@gmail.com> - 4.13.1-2
|
||||
- Rebuild for opencascade 7.8.1.
|
||||
|
||||
* Wed May 08 2024 Sandro Mani <manisandro@gmail.com> - 4.13.1-1
|
||||
- Update to 4.13.1
|
||||
|
||||
* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 4.13.0-3
|
||||
* Tue Apr 09 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 4.12.2-2
|
||||
- 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 <hobbes1069@gmail.com> - 4.13.0-2
|
||||
- Rebuild for OpenCascade 7.8.0.
|
||||
|
||||
* Tue Feb 27 2024 Sandro Mani <manisandro@gmail.com> - 4.13.0-1
|
||||
- Update to 4.13.0
|
||||
|
||||
* Tue Jan 23 2024 Sandro Mani <manisandro@gmail.com> - 4.12.2-1
|
||||
- Update to 4.12.2
|
||||
|
||||
|
|
|
|||
24
gmsh_build.patch
Normal file
24
gmsh_build.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
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
|
||||
@@ -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 <med/med.h>
|
||||
+#endif
|
||||
+
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
@@ -11,7 +17,6 @@
|
||||
#include <FL/Fl_Check_Button.H>
|
||||
#include <FL/Fl_Input.H>
|
||||
#include <FL/Fl_Color_Chooser.H>
|
||||
-#include "GmshConfig.h"
|
||||
#include "FlGui.h"
|
||||
#include "inputValue.h"
|
||||
#include "helpWindow.h"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
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()
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
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)
|
||||
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)
|
||||
# when building, don't use the install RPATH already (but later on when
|
||||
# installing)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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()
|
||||
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()
|
||||
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})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
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
|
||||
@@ -42,7 +42,7 @@
|
||||
#endif
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ diff -rupN --no-dereference gmsh-4.15.0-source/src/common/CommandLine.cpp gmsh-4
|
|||
#endif
|
||||
|
||||
#if defined(HAVE_POST)
|
||||
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 @@
|
||||
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
|
||||
@@ -36,7 +36,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_MED)
|
||||
|
|
@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.15.0-source/src/fltk/helpWindow.cpp gmsh-4.15
|
|||
#endif
|
||||
|
||||
static const char *help_link(Fl_Widget *w, const char *uri)
|
||||
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
|
||||
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
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "discreteVertex.h"
|
||||
#include "Context.h"
|
||||
|
|
@ -34,9 +34,9 @@ diff -rupN --no-dereference gmsh-4.15.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.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
|
||||
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
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#if defined(HAVE_MED)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
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()
|
||||
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()
|
||||
set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -9,8 +9,8 @@ diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.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
|
||||
@@ -2034,14 +2036,14 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHAR
|
||||
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
|
||||
@@ -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,10 +28,10 @@ diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.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.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
|
||||
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
|
||||
@@ -173,14 +173,6 @@ void Msg::Initialize(int argc, char **ar
|
||||
if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size())
|
||||
CTX::instance()->exeFileName = _commandLineArgs[0];
|
||||
|
||||
|
|
|
|||
50
gmsh_uint64.patch
Normal file
50
gmsh_uint64.patch
Normal file
|
|
@ -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; t<maxThreads; t++) {
|
||||
- size_t tsum = sum + startPt[t];
|
||||
+ uint32_t tsum = sum + startPt[t];
|
||||
startPt[t] = sum;
|
||||
sum = tsum;
|
||||
}
|
||||
@@ -334,16 +334,16 @@ static HXTStatus balanceRefineWork(HXTMe
|
||||
// each thread finish the prefix sum in its own array
|
||||
#pragma omp for
|
||||
for(uint64_t i=0; i<mesh->tetrahedra.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;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
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
|
||||
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
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.15.0-source/CMakeLists.txt gmsh-4.15.0-source
|
|||
# Linux-specific linker options
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
if(HAVE_OCC)
|
||||
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
|
||||
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
|
||||
@@ -15,7 +15,6 @@ set(SRC
|
||||
drawScales.cpp
|
||||
drawGraph2d.cpp
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (gmsh-4.15.0-source-fedora.tar.xz) = eac4f6e8cd342ec07e1a83cae966d81716e1d158398ed930c82322b61785f8ab38c84ec07efc91f7be523d872e3331e1a64ce81b20a8c899a82107fab9834add
|
||||
SHA512 (gmsh-4.12.2-source-fedora.tar.xz) = a4231206c63fdd53fa166620036dd151124fe46f368b5f4009b3937ad762aa4648d0b2358c41a2a686bdaa529caefabd0e6e153bde1c047179f3230342238fe1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue