diff --git a/.gitignore b/.gitignore index 98b65b5..35e7589 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /gmsh-4.3.0-source-fedora.tar.xz /gmsh-4.4.0-source-fedora.tar.xz /gmsh-4.4.1-source-fedora.tar.xz +/gmsh-4.5.1-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index fc2a7fc..78204ff 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,8 +3,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.5.1 +Release: 1%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -21,12 +21,12 @@ Patch0: gmsh_python.patch Patch1: gmsh_c++14.patch # Adapt med.h include path Patch2: gmsh_med.patch -# Fix macro collision with symbol by re-ordering includes -Patch3: gmsh_build.patch # Install Julia API to share/gmsh -Patch4: gmsh_julia.patch +Patch3: gmsh_julia.patch # Remove odd install of gmsh shared library -Patch5: gmsh_install.patch +Patch4: gmsh_install.patch +# Fix build error caused by include ordering +Patch5: gmsh_build.patch BuildRequires: alglib-devel BuildRequires: ann-devel @@ -51,7 +51,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: metis-devel BuildRequires: mmg3d-devel BuildRequires: netgen-mesher-devel-private -BuildRequires: OCE-devel +BuildRequires: opencascade-devel BuildRequires: python3-devel BuildRequires: voro++-devel BuildRequires: zlib-devel @@ -339,7 +339,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files libs %license LICENSE.txt -%{_libdir}/libgmsh.so.4.4* +%{_libdir}/libgmsh.so.4.5* %files -n python3-%{name} %{python3_sitelib}/gmsh.py @@ -357,7 +357,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files openmpi-libs %license LICENSE.txt -%{_libdir}/openmpi/lib/libgmsh.so.4.4* +%{_libdir}/openmpi/lib/libgmsh.so.4.5* %endif %if %{with mpich} @@ -372,11 +372,14 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files mpich-libs %license LICENSE.txt -%{_libdir}/mpich/lib/libgmsh.so.4.4* +%{_libdir}/mpich/lib/libgmsh.so.4.5* %endif %changelog +* Sat Dec 28 2019 Sandro Mani - 4.5.1-1 +- Update to 4.5.1 + * Thu Oct 03 2019 Miro HronĨok - 4.4.1-3 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/gmsh_build.patch b/gmsh_build.patch index 5244775..640051b 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,41 +1,6 @@ -diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common/CommandLine.cpp ---- gmsh-4.4.1-source/Common/CommandLine.cpp 2019-07-29 16:44:32.132608978 +0200 -+++ gmsh-4.4.1-source-new/Common/CommandLine.cpp 2019-07-29 16:44:32.135608880 +0200 -@@ -22,15 +22,6 @@ - #include "GmshGlobal.h" - #include "StringUtils.h" - --#if defined(HAVE_FLTK) --#include --#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3) --// OK --#else --#error "Gmsh requires FLTK >= 1.3" --#endif --#endif -- - #if defined(HAVE_PETSC) - #include "petsc.h" - #endif -@@ -51,6 +42,15 @@ - #include "Parser.h" - #endif - -+#if defined(HAVE_FLTK) -+#include -+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3) -+// OK -+#else -+#error "Gmsh requires FLTK >= 1.3" -+#endif -+#endif -+ - int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; } - int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; } - int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; } -diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/helpWindow.cpp ---- gmsh-4.4.1-source/Fltk/helpWindow.cpp 2019-07-29 16:44:32.132608978 +0200 -+++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp 2019-07-29 16:44:32.136608848 +0200 +diff -rupN --no-dereference gmsh-4.5.1-source/Fltk/helpWindow.cpp gmsh-4.5.1-source-new/Fltk/helpWindow.cpp +--- gmsh-4.5.1-source/Fltk/helpWindow.cpp 2019-12-28 22:38:32.870791389 +0100 ++++ gmsh-4.5.1-source-new/Fltk/helpWindow.cpp 2019-12-28 22:38:33.154793777 +0100 @@ -3,6 +3,12 @@ // See the LICENSE.txt file for license information. Please report all // issues on https://gitlab.onelab.info/gmsh/gmsh/issues. @@ -57,29 +22,28 @@ diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/help #include "FlGui.h" #include "inputValue.h" #include "helpWindow.h" -diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej ---- gmsh-4.4.1-source/Fltk/helpWindow.cpp.rej 1970-01-01 01:00:00.000000000 +0100 -+++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp.rej 2019-07-29 16:44:32.136608848 +0200 -@@ -0,0 +1,22 @@ -+--- Fltk/helpWindow.cpp 2019-04-19 22:52:22.064137747 +0200 -++++ Fltk/helpWindow.cpp 2019-04-19 22:52:22.067137724 +0200 -+@@ -3,13 +3,18 @@ -+ // See the LICENSE.txt file 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 -+ #include -+ #include -+ #include -+-#include "GmshConfig.h" -+ #include "FlGui.h" -+ #include "inputValue.h" -+ #include "helpWindow.h" +diff -rupN --no-dereference gmsh-4.5.1-source/Mesh/gmshCrossFields.cpp gmsh-4.5.1-source-new/Mesh/gmshCrossFields.cpp +--- gmsh-4.5.1-source/Mesh/gmshCrossFields.cpp 2019-12-21 03:59:26.000000000 +0100 ++++ gmsh-4.5.1-source-new/Mesh/gmshCrossFields.cpp 2019-12-28 22:38:33.153793768 +0100 +@@ -20,10 +20,6 @@ + #include "PView.h" + #include "PViewDataGModel.h" + +-#ifdef HAVE_FLTK +-#include "FlGui.h" +-#endif +- + #if defined(_OPENMP) + #include + #endif +@@ -37,6 +33,10 @@ + #include "linearSystemFull.h" + #include "linearSystemPETSc.h" + ++#ifdef HAVE_FLTK ++#include "FlGui.h" ++#endif ++ + static inline double lifting(double a, double _a) + { + double D = M_PI * .5; diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch index a8f3d0d..9aa1b7e 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,16 +1,16 @@ -diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt ---- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:31.843618424 +0200 -+++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:31.845618358 +0200 -@@ -43,7 +43,7 @@ opt(BUILD_ANDROID "Enable Android NDK li - opt(BUILD_IOS "Enable iOS library target (experimental)" OFF) - opt(CGNS "Enable CGNS mesh import (experimental)" ${DEFAULT}) +diff -rupN --no-dereference gmsh-4.5.1-source/CMakeLists.txt gmsh-4.5.1-source-new/CMakeLists.txt +--- gmsh-4.5.1-source/CMakeLists.txt 2019-12-28 22:38:32.609789193 +0100 ++++ gmsh-4.5.1-source-new/CMakeLists.txt 2019-12-28 22:38:32.611789209 +0100 +@@ -44,7 +44,7 @@ opt(BUILD_IOS "Enable iOS library target + opt(CGNS "Enable CGNS import/export (experimental)" ${DEFAULT}) + opt(CGNS_CPEX0045 "Enable high-order CGNS import/export following CPEX0045 (experimental)" OFF) opt(CAIRO "Enable Cairo to render fonts (experimental)" ${DEFAULT}) -opt(CXX11 "Enable C++11" ON) +opt(CXX14 "Enable C++14" ON) opt(C99 "Enable C99" ON) opt(PROFILE "Enable profiling compiler flags" OFF) opt(DINTEGRATION "Enable discrete integration (needed for levelsets)" ${DEFAULT}) -@@ -305,13 +305,13 @@ if(ENABLE_OPENMP) +@@ -324,13 +324,13 @@ if(ENABLE_OPENACC) endif() endif() @@ -31,7 +31,7 @@ diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt if(ENABLE_C99) # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99) -@@ -1509,10 +1509,10 @@ if(ENABLE_REVOROPT) +@@ -1537,10 +1537,10 @@ if(ENABLE_REVOROPT) get_source_file_property(PROP Plugin/CVTRemesh.cpp COMPILE_FLAGS) if(PROP) set_source_files_properties(Plugin/CVTRemesh.cpp PROPERTIES @@ -44,7 +44,7 @@ diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt endif() else() message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, ANN and ALGLIB") -@@ -1692,7 +1692,7 @@ if(ENABLE_BUILD_ANDROID) +@@ -1720,7 +1720,7 @@ if(ENABLE_BUILD_ANDROID) message(FATAL_ERROR "Cannot compile Gmsh for android without android-cmake") endif() add_definitions(-D_GLIBCXX_USE_C99_MATH=1) diff --git a/gmsh_install.patch b/gmsh_install.patch index 72589f4..b6a5807 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt ---- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:32.383600789 +0200 -+++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:32.385600723 +0200 -@@ -1838,7 +1838,7 @@ endif() +diff -rupN --no-dereference gmsh-4.5.1-source/CMakeLists.txt gmsh-4.5.1-source-new/CMakeLists.txt +--- gmsh-4.5.1-source/CMakeLists.txt 2019-12-28 22:38:32.995792440 +0100 ++++ gmsh-4.5.1-source-new/CMakeLists.txt 2019-12-28 22:38:32.997792457 +0100 +@@ -1866,7 +1866,7 @@ endif() if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) # FIXME once we cleanup the installation of the python module diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 3bea278..f2b3903 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt ---- gmsh-4.4.1-source/CMakeLists.txt 2019-07-29 16:44:31.974614136 +0200 -+++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:32.251605096 +0200 -@@ -1847,7 +1847,7 @@ endif() +diff -rupN --no-dereference gmsh-4.5.1-source/CMakeLists.txt gmsh-4.5.1-source-new/CMakeLists.txt +--- gmsh-4.5.1-source/CMakeLists.txt 2019-12-28 22:38:32.740790295 +0100 ++++ gmsh-4.5.1-source-new/CMakeLists.txt 2019-12-28 22:38:32.872791405 +0100 +@@ -1875,7 +1875,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 6dbe524..b9fe64d 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common/CommandLine.cpp ---- gmsh-4.4.1-source/Common/CommandLine.cpp 2019-07-14 22:16:04.000000000 +0200 -+++ gmsh-4.4.1-source-new/Common/CommandLine.cpp 2019-07-29 16:44:31.994613481 +0200 -@@ -40,7 +40,7 @@ +diff -rupN --no-dereference gmsh-4.5.1-source/Common/CommandLine.cpp gmsh-4.5.1-source-new/Common/CommandLine.cpp +--- gmsh-4.5.1-source/Common/CommandLine.cpp 2019-12-21 03:59:24.000000000 +0100 ++++ gmsh-4.5.1-source-new/Common/CommandLine.cpp 2019-12-28 22:38:32.742790312 +0100 +@@ -42,7 +42,7 @@ #endif #if defined(HAVE_MED) @@ -10,9 +10,9 @@ diff -rupN gmsh-4.4.1-source/Common/CommandLine.cpp gmsh-4.4.1-source-new/Common #endif #if defined(HAVE_POST) -diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/helpWindow.cpp ---- gmsh-4.4.1-source/Fltk/helpWindow.cpp 2019-07-14 22:16:04.000000000 +0200 -+++ gmsh-4.4.1-source-new/Fltk/helpWindow.cpp 2019-07-29 16:44:32.004613155 +0200 +diff -rupN --no-dereference gmsh-4.5.1-source/Fltk/helpWindow.cpp gmsh-4.5.1-source-new/Fltk/helpWindow.cpp +--- gmsh-4.5.1-source/Fltk/helpWindow.cpp 2019-12-21 03:59:24.000000000 +0100 ++++ gmsh-4.5.1-source-new/Fltk/helpWindow.cpp 2019-12-28 22:38:32.742790312 +0100 @@ -38,7 +38,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN gmsh-4.4.1-source/Fltk/helpWindow.cpp gmsh-4.4.1-source-new/Fltk/help #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN gmsh-4.4.1-source/Geo/GModelIO_MED.cpp gmsh-4.4.1-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.4.1-source/Geo/GModelIO_MED.cpp 2019-07-14 23:15:09.000000000 +0200 -+++ gmsh-4.4.1-source-new/Geo/GModelIO_MED.cpp 2019-07-29 16:44:32.004613155 +0200 +diff -rupN --no-dereference gmsh-4.5.1-source/Geo/GModelIO_MED.cpp gmsh-4.5.1-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.5.1-source/Geo/GModelIO_MED.cpp 2019-11-28 15:09:31.000000000 +0100 ++++ gmsh-4.5.1-source-new/Geo/GModelIO_MED.cpp 2019-12-28 22:38:32.742790312 +0100 @@ -26,7 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -34,10 +34,10 @@ diff -rupN gmsh-4.4.1-source/Geo/GModelIO_MED.cpp gmsh-4.4.1-source-new/Geo/GMod #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN gmsh-4.4.1-source/Post/PViewDataGModelIO.cpp gmsh-4.4.1-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.4.1-source/Post/PViewDataGModelIO.cpp 2019-05-14 21:27:31.000000000 +0200 -+++ gmsh-4.4.1-source-new/Post/PViewDataGModelIO.cpp 2019-07-29 16:44:32.005613122 +0200 -@@ -469,7 +469,7 @@ void PViewDataGModel::importLists(int N[ +diff -rupN --no-dereference gmsh-4.5.1-source/Post/PViewDataGModelIO.cpp gmsh-4.5.1-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.5.1-source/Post/PViewDataGModelIO.cpp 2019-12-20 19:05:44.000000000 +0100 ++++ gmsh-4.5.1-source-new/Post/PViewDataGModelIO.cpp 2019-12-28 22:38:32.742790312 +0100 +@@ -471,7 +471,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 6209fce..3134c2c 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt ---- gmsh-4.4.1-source/CMakeLists.txt 2019-07-14 22:16:04.000000000 +0200 -+++ gmsh-4.4.1-source-new/CMakeLists.txt 2019-07-29 16:44:31.726622254 +0200 -@@ -1819,6 +1819,8 @@ else() +diff -rupN --no-dereference gmsh-4.5.1-source/CMakeLists.txt gmsh-4.5.1-source-new/CMakeLists.txt +--- gmsh-4.5.1-source/CMakeLists.txt 2019-12-22 11:16:32.000000000 +0100 ++++ gmsh-4.5.1-source-new/CMakeLists.txt 2019-12-28 22:38:32.460787939 +0100 +@@ -1847,6 +1847,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt # FIXME: change this once we understand rpaths if(APPLE) if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) -@@ -1840,11 +1842,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1868,11 +1870,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB) @@ -24,9 +24,9 @@ diff -rupN gmsh-4.4.1-source/CMakeLists.txt gmsh-4.4.1-source-new/CMakeLists.txt install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB}) if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) -diff -rupN gmsh-4.4.1-source/Common/GmshMessage.cpp gmsh-4.4.1-source-new/Common/GmshMessage.cpp ---- gmsh-4.4.1-source/Common/GmshMessage.cpp 2019-07-14 22:16:04.000000000 +0200 -+++ gmsh-4.4.1-source-new/Common/GmshMessage.cpp 2019-07-29 16:44:31.726622254 +0200 +diff -rupN --no-dereference gmsh-4.5.1-source/Common/GmshMessage.cpp gmsh-4.5.1-source-new/Common/GmshMessage.cpp +--- gmsh-4.5.1-source/Common/GmshMessage.cpp 2019-12-25 23:34:11.000000000 +0100 ++++ gmsh-4.5.1-source-new/Common/GmshMessage.cpp 2019-12-28 22:38:32.461787948 +0100 @@ -154,12 +154,6 @@ void Msg::Init(int argc, char **argv) if(CTX::instance()->exeFileName.empty() && argc && argv) CTX::instance()->exeFileName = argv[0]; diff --git a/sources b/sources index d7fd881..e77165b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.4.1-source-fedora.tar.xz) = b8e2210c80a3309232f3b4a6353eaec57704b0a2705a9b181b83aa6282bb4ae7fe07365047d88c3c772f31dcdf60347720fe84ec8621fea9bb06b1f2c377ca3e +SHA512 (gmsh-4.5.1-source-fedora.tar.xz) = 1cbd21bfafef5ce06066bd59fbfc1ac55c4bf9d4f0e7657877ae1535b1ef2a46ac70bd666075f2fde3bbad3b3d3df048ad043adfd9773fdb58be24692bcd622d