diff --git a/.gitignore b/.gitignore index e874183..2bf2730 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /gmsh-4.0.4-source-fedora.tar.xz /gmsh-4.0.5-source-fedora.tar.xz /gmsh-4.0.6-source-fedora.tar.xz +/gmsh-4.0.7-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index 1e6b86b..fe9b480 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,7 +3,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.0.6 +Version: 4.0.7 Release: 1%{?dist} License: GPLv2+ @@ -428,6 +428,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Mon Dec 10 2018 Sandro Mani - 4.0.7-1 +- Update to 4.0.7 + * Sun Nov 25 2018 Sandro Mani - 4.0.6-1 - Update to 4.0.6 diff --git a/gmsh_alglib.patch b/gmsh_alglib.patch index ed9919c..9b823d6 100644 --- a/gmsh_alglib.patch +++ b/gmsh_alglib.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-4.0.6-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp ---- gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2018-11-25 22:30:25.407946040 +0100 +diff -rupN gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-4.0.7-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp +--- gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2018-12-10 16:42:02.619728663 +0100 @@ -41,11 +41,11 @@ static int NEVAL = 0; #if defined(HAVE_BFGS) @@ -18,9 +18,9 @@ diff -rupN gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-4.0. static inline double compute_f(double v, double barrier) { -diff -rupN gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-4.0.6-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h ---- gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.h 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h 2018-11-25 22:30:25.407946040 +0100 +diff -rupN gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-4.0.7-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h +--- gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.h 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h 2018-12-10 16:42:02.619728663 +0100 @@ -35,7 +35,7 @@ #if defined(HAVE_BFGS) @@ -30,9 +30,9 @@ diff -rupN gmsh-4.0.6-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-4.0.6- class OptHOM { -diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOpt.cpp ---- gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOpt.cpp 2018-11-25 22:30:25.407946040 +0100 +diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOpt.cpp +--- gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOpt.cpp 2018-12-10 16:42:02.619728663 +0100 @@ -35,11 +35,11 @@ #if defined(HAVE_BFGS) @@ -50,9 +50,9 @@ diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.0.6-source namespace { -diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOpt.h ---- gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.h 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOpt.h 2018-11-25 22:30:25.407946040 +0100 +diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOpt.h +--- gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.h 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOpt.h 2018-12-10 16:42:02.619728663 +0100 @@ -39,7 +39,7 @@ #if defined(HAVE_BFGS) @@ -62,9 +62,9 @@ diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.0.6-source-n class MeshOptParameters; -diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h ---- gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjContrib.h 2017-10-03 22:01:51.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h 2018-11-25 22:30:25.408946036 +0100 +diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h +--- gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjContrib.h 2017-10-03 22:01:51.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h 2018-12-10 16:42:02.620728662 +0100 @@ -4,7 +4,7 @@ #define _MESHOPTOBJCONTRIB_H_ @@ -74,9 +74,9 @@ diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-4.0. #include "MeshOptCommon.h" -diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h ---- gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2017-10-03 22:01:51.000000000 +0200 -+++ gmsh-4.0.6-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2018-11-25 22:30:25.408946036 +0100 +diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h +--- gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2017-10-03 22:01:51.000000000 +0200 ++++ gmsh-4.0.7-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2018-12-10 16:42:02.620728662 +0100 @@ -5,7 +5,7 @@ #include @@ -86,10 +86,10 @@ diff -rupN gmsh-4.0.6-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gm class ObjContrib; class Patch; -diff -rupN gmsh-4.0.6-source/Geo/GFace.cpp gmsh-4.0.6-source-new/Geo/GFace.cpp ---- gmsh-4.0.6-source/Geo/GFace.cpp 2018-11-15 17:08:17.000000000 +0100 -+++ gmsh-4.0.6-source-new/Geo/GFace.cpp 2018-11-25 22:30:25.408946036 +0100 -@@ -28,8 +28,8 @@ +diff -rupN gmsh-4.0.7-source/Geo/GFace.cpp gmsh-4.0.7-source-new/Geo/GFace.cpp +--- gmsh-4.0.7-source/Geo/GFace.cpp 2018-12-09 14:02:39.000000000 +0100 ++++ gmsh-4.0.7-source-new/Geo/GFace.cpp 2018-12-10 16:42:02.620728662 +0100 +@@ -27,8 +27,8 @@ #endif #if defined(HAVE_BFGS) @@ -100,43 +100,3 @@ diff -rupN gmsh-4.0.6-source/Geo/GFace.cpp gmsh-4.0.6-source-new/Geo/GFace.cpp #endif // TODO C++11 remove macro -diff -rupN gmsh-4.0.6-source/Mesh/Levy3D.cpp gmsh-4.0.6-source-new/Mesh/Levy3D.cpp ---- gmsh-4.0.6-source/Mesh/Levy3D.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Mesh/Levy3D.cpp 2018-11-25 22:30:25.409946034 +0100 -@@ -18,11 +18,11 @@ - #include "directions3D.h" - - #if defined(HAVE_BFGS) --#include "ap.h" --#include "alglibinternal.h" --#include "alglibmisc.h" --#include "linalg.h" --#include "optimization.h" -+#include -+#include -+#include -+#include -+#include - #endif - - /*********definitions*********/ -diff -rupN gmsh-4.0.6-source/Mesh/meshGFaceLloyd.cpp gmsh-4.0.6-source-new/Mesh/meshGFaceLloyd.cpp ---- gmsh-4.0.6-source/Mesh/meshGFaceLloyd.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Mesh/meshGFaceLloyd.cpp 2018-11-25 22:30:25.409946034 +0100 -@@ -21,11 +21,11 @@ - - #if defined(HAVE_BFGS) - --#include "ap.h" --#include "alglibinternal.h" --#include "alglibmisc.h" --#include "linalg.h" --#include "optimization.h" -+#include -+#include -+#include -+#include -+#include - #include "MElementOctree.h" - #include "GModel.h" - #include "meshGFaceOptimize.h" diff --git a/gmsh_build.patch b/gmsh_build.patch index 72be8b8..50caa1d 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.0.6-source/Common/CommandLine.cpp gmsh-4.0.6-source-new/Common/CommandLine.cpp ---- gmsh-4.0.6-source/Common/CommandLine.cpp 2018-11-25 22:30:26.231943637 +0100 -+++ gmsh-4.0.6-source-new/Common/CommandLine.cpp 2018-11-25 22:30:26.235943625 +0100 +diff -rupN gmsh-4.0.7-source/Common/CommandLine.cpp gmsh-4.0.7-source-new/Common/CommandLine.cpp +--- gmsh-4.0.7-source/Common/CommandLine.cpp 2018-12-10 16:42:03.093728156 +0100 ++++ gmsh-4.0.7-source-new/Common/CommandLine.cpp 2018-12-10 16:42:03.096728153 +0100 @@ -22,15 +22,6 @@ #include "GmshGlobal.h" #include "StringUtils.h" @@ -33,9 +33,9 @@ diff -rupN gmsh-4.0.6-source/Common/CommandLine.cpp gmsh-4.0.6-source-new/Common int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; } int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; } int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; } -diff -rupN gmsh-4.0.6-source/Fltk/helpWindow.cpp gmsh-4.0.6-source-new/Fltk/helpWindow.cpp ---- gmsh-4.0.6-source/Fltk/helpWindow.cpp 2018-11-25 22:30:26.231943637 +0100 -+++ gmsh-4.0.6-source-new/Fltk/helpWindow.cpp 2018-11-25 22:30:26.236943622 +0100 +diff -rupN gmsh-4.0.7-source/Fltk/helpWindow.cpp gmsh-4.0.7-source-new/Fltk/helpWindow.cpp +--- gmsh-4.0.7-source/Fltk/helpWindow.cpp 2018-12-10 16:42:03.093728156 +0100 ++++ gmsh-4.0.7-source-new/Fltk/helpWindow.cpp 2018-12-10 16:42:03.096728153 +0100 @@ -3,13 +3,18 @@ // See the LICENSE.txt file for license information. Please report all // issues on https://gitlab.onelab.info/gmsh/gmsh/issues @@ -67,9 +67,9 @@ diff -rupN gmsh-4.0.6-source/Fltk/helpWindow.cpp gmsh-4.0.6-source-new/Fltk/help static const char *help_link(Fl_Widget *w, const char *uri) { fl_open_uri(uri); -diff -rupN gmsh-4.0.6-source/Geo/GModelIO_MED.cpp gmsh-4.0.6-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.0.6-source/Geo/GModelIO_MED.cpp 2018-11-25 22:30:26.232943633 +0100 -+++ gmsh-4.0.6-source-new/Geo/GModelIO_MED.cpp 2018-11-25 22:30:26.237943619 +0100 +diff -rupN gmsh-4.0.7-source/Geo/GModelIO_MED.cpp gmsh-4.0.7-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.0.7-source/Geo/GModelIO_MED.cpp 2018-12-10 16:42:03.094728155 +0100 ++++ gmsh-4.0.7-source-new/Geo/GModelIO_MED.cpp 2018-12-10 16:42:03.096728153 +0100 @@ -26,9 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -80,9 +80,9 @@ diff -rupN gmsh-4.0.6-source/Geo/GModelIO_MED.cpp gmsh-4.0.6-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.0.6-source/Post/PViewDataGModelIO.cpp gmsh-4.0.6-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.0.6-source/Post/PViewDataGModelIO.cpp 2018-11-25 22:30:26.232943633 +0100 -+++ gmsh-4.0.6-source-new/Post/PViewDataGModelIO.cpp 2018-11-25 22:30:26.237943619 +0100 +diff -rupN gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp gmsh-4.0.7-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp 2018-12-10 16:42:03.094728155 +0100 ++++ gmsh-4.0.7-source-new/Post/PViewDataGModelIO.cpp 2018-12-10 16:42:03.097728152 +0100 @@ -469,9 +469,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch index f267e36..b56d0e6 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-25 22:30:25.821944832 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:25.825944820 +0100 +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-10 16:42:02.856728410 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:02.859728407 +0100 @@ -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" ${DEFAULT}) @@ -10,17 +10,17 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt opt(C99 "Enable C99" ${DEFAULT}) opt(PROFILE "Enable profiling compiler flags" OFF) opt(DINTEGRATION "Enable discrete integration (needed for levelsets)" ${DEFAULT}) -@@ -293,13 +293,13 @@ if(ENABLE_OPENMP) - endif(OPENMP_FOUND) - endif(ENABLE_OPENMP) +@@ -291,13 +291,13 @@ if(ENABLE_OPENMP) + endif() + endif() -if(ENABLE_CXX11) - # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) - check_cxx_compiler_flag("-std=c++11" STDCXX11) - if(STDCXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -- endif(STDCXX11) --endif(ENABLE_CXX11) +- endif() +-endif() +if(ENABLE_CXX14) + check_cxx_compiler_flag("-std=c++14" STDCXX14) + if(STDCXX14) @@ -31,22 +31,22 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt if(ENABLE_C99) # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99) -@@ -1450,10 +1450,10 @@ if(ENABLE_REVOROPT) +@@ -1455,10 +1455,10 @@ if(ENABLE_REVOROPT) get_source_file_property(PROP Plugin/CVTRemesh.cpp COMPILE_FLAGS) if(PROP) set_source_files_properties(Plugin/CVTRemesh.cpp PROPERTIES - COMPILE_FLAGS "${PROP} -std=c++11") + COMPILE_FLAGS "${PROP} -std=c++14") - else(PROP) + else() set_source_files_properties(Plugin/CVTRemesh.cpp PROPERTIES - COMPILE_FLAGS "-std=c++11") + COMPILE_FLAGS "-std=c++14") - endif(PROP) - else(EIGEN3_INC AND HAVE_MESH AND HAVE_PLUGINS AND HAVE_ANN AND HAVE_BFGS) + endif() + else() message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, Ann and BFGS") -@@ -1627,7 +1627,7 @@ if(ENABLE_BUILD_ANDROID) +@@ -1632,7 +1632,7 @@ if(ENABLE_BUILD_ANDROID) message(FATAL_ERROR "Cannot compile Gmsh for android without android-cmake") - endif(NOT CMAKE_TOOLCHAIN_FILE) + endif() add_definitions(-D_GLIBCXX_USE_C99_MATH=1) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") diff --git a/gmsh_install.patch b/gmsh_install.patch index 18cf01f..7e1ba60 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,12 +1,12 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-25 22:30:26.655942400 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:26.659942389 +0100 -@@ -1775,7 +1775,7 @@ endif(ENABLE_BUILD_LIB) +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-10 16:42:03.335727898 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:03.337727896 +0100 +@@ -1778,7 +1778,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 - install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL) -+# install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL) - endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) ++ # install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL) + endif() if(ENABLE_ONELAB) diff --git a/gmsh_julia.patch b/gmsh_julia.patch index 9611534..8e4c372 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-25 22:30:26.230943639 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:26.442943021 +0100 -@@ -1784,7 +1784,7 @@ endif(ENABLE_ONELAB) +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-10 16:42:03.093728156 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:03.218728023 +0100 +@@ -1787,7 +1787,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}) @@ -9,4 +9,4 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt + install(FILES ${GMSH_JL} DESTINATION share/gmsh) if(ENABLE_PRIVATE_API) install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh) - endif(ENABLE_PRIVATE_API) + endif() diff --git a/gmsh_med.patch b/gmsh_med.patch index b159f8e..f11b70a 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-25 22:30:26.030944223 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:26.035944208 +0100 +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-10 16:42:02.976728281 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:02.978728279 +0100 @@ -918,7 +918,7 @@ if(ENABLE_MED OR ENABLE_CGNS) set(HDF5_LIB "${HDF5_C_LIBRARIES}") list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS}) @@ -10,9 +10,9 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt if(MED_LIB) set_config_option(HAVE_MED "Med") list(APPEND EXTERNAL_LIBRARIES ${MED_LIB}) -diff -rupN gmsh-4.0.6-source/Common/CommandLine.cpp gmsh-4.0.6-source-new/Common/CommandLine.cpp ---- gmsh-4.0.6-source/Common/CommandLine.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Common/CommandLine.cpp 2018-11-25 22:30:26.036944205 +0100 +diff -rupN gmsh-4.0.7-source/Common/CommandLine.cpp gmsh-4.0.7-source-new/Common/CommandLine.cpp +--- gmsh-4.0.7-source/Common/CommandLine.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/Common/CommandLine.cpp 2018-12-10 16:42:02.978728279 +0100 @@ -40,7 +40,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN gmsh-4.0.6-source/Common/CommandLine.cpp gmsh-4.0.6-source-new/Common #endif #if defined(HAVE_POST) -diff -rupN gmsh-4.0.6-source/Fltk/helpWindow.cpp gmsh-4.0.6-source-new/Fltk/helpWindow.cpp ---- gmsh-4.0.6-source/Fltk/helpWindow.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Fltk/helpWindow.cpp 2018-11-25 22:30:26.036944205 +0100 +diff -rupN gmsh-4.0.7-source/Fltk/helpWindow.cpp gmsh-4.0.7-source-new/Fltk/helpWindow.cpp +--- gmsh-4.0.7-source/Fltk/helpWindow.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/Fltk/helpWindow.cpp 2018-12-10 16:42:02.978728279 +0100 @@ -34,7 +34,7 @@ #endif @@ -34,9 +34,9 @@ diff -rupN gmsh-4.0.6-source/Fltk/helpWindow.cpp gmsh-4.0.6-source-new/Fltk/help #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN gmsh-4.0.6-source/Geo/GModelIO_MED.cpp gmsh-4.0.6-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.0.6-source/Geo/GModelIO_MED.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Geo/GModelIO_MED.cpp 2018-11-25 22:30:26.037944202 +0100 +diff -rupN gmsh-4.0.7-source/Geo/GModelIO_MED.cpp gmsh-4.0.7-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.0.7-source/Geo/GModelIO_MED.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.0.7-source-new/Geo/GModelIO_MED.cpp 2018-12-10 16:42:02.979728278 +0100 @@ -27,7 +27,7 @@ #include "Context.h" @@ -46,9 +46,9 @@ diff -rupN gmsh-4.0.6-source/Geo/GModelIO_MED.cpp gmsh-4.0.6-source-new/Geo/GMod } #if(MED_MAJOR_NUM == 3) -diff -rupN gmsh-4.0.6-source/Post/PViewDataGModelIO.cpp gmsh-4.0.6-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.0.6-source/Post/PViewDataGModelIO.cpp 2018-10-21 12:15:16.000000000 +0200 -+++ gmsh-4.0.6-source-new/Post/PViewDataGModelIO.cpp 2018-11-25 22:30:26.037944202 +0100 +diff -rupN gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp gmsh-4.0.7-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp 2018-12-08 11:33:53.000000000 +0100 ++++ gmsh-4.0.7-source-new/Post/PViewDataGModelIO.cpp 2018-12-10 16:42:02.979728278 +0100 @@ -470,7 +470,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) diff --git a/gmsh_python.patch b/gmsh_python.patch index 261ea7c..d2cc715 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,22 +1,22 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-25 22:30:25.402946054 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:25.616945430 +0100 -@@ -1756,6 +1756,8 @@ else(WIN32 OR CYGWIN) +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-10 16:42:02.609728674 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:02.743728531 +0100 +@@ -1759,6 +1759,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) - endif(WIN32 OR CYGWIN) + endif() +execute_process ( COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON3_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + # FIXME: change this once we understand rpaths if(APPLE) if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) -@@ -1777,11 +1779,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D - endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) +@@ -1780,11 +1782,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D + endif() if(ENABLE_ONELAB) - install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN}) + install(FILES ${ONELAB_PY} DESTINATION ${PYTHON3_SITE_PACKAGES}) - endif(ENABLE_ONELAB) + 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 ${GMSH_LIB}) @@ -24,9 +24,9 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-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.0.6-source/Common/GmshMessage.cpp gmsh-4.0.6-source-new/Common/GmshMessage.cpp ---- gmsh-4.0.6-source/Common/GmshMessage.cpp 2018-11-21 23:22:46.000000000 +0100 -+++ gmsh-4.0.6-source-new/Common/GmshMessage.cpp 2018-11-25 22:30:25.616945430 +0100 +diff -rupN gmsh-4.0.7-source/Common/GmshMessage.cpp gmsh-4.0.7-source-new/Common/GmshMessage.cpp +--- gmsh-4.0.7-source/Common/GmshMessage.cpp 2018-11-21 23:22:46.000000000 +0100 ++++ gmsh-4.0.7-source-new/Common/GmshMessage.cpp 2018-12-10 16:42:02.743728531 +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/gmsh_unbundle.patch b/gmsh_unbundle.patch index 80b0666..141fa5e 100644 --- a/gmsh_unbundle.patch +++ b/gmsh_unbundle.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt ---- gmsh-4.0.6-source/CMakeLists.txt 2018-11-18 19:13:42.000000000 +0100 -+++ gmsh-4.0.6-source-new/CMakeLists.txt 2018-11-25 22:30:25.203946635 +0100 -@@ -129,7 +129,7 @@ if(ENABLE_PRIVATE_API) +diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt +--- gmsh-4.0.7-source/CMakeLists.txt 2018-12-09 14:02:39.000000000 +0100 ++++ gmsh-4.0.7-source-new/CMakeLists.txt 2018-12-10 16:42:02.481728810 +0100 +@@ -128,7 +128,7 @@ if(ENABLE_PRIVATE_API) file(GLOB_RECURSE HEADERS Common/*.h Numeric/*.h Geo/*.h Mesh/*.h Solver/*.h Post/*.h Graphics/*.h contrib/kbipack/*.h contrib/DiscreteIntegration/*.h contrib/HighOrderMeshOptimizer/*.h contrib/MeshOptimizer/*.h @@ -10,8 +10,8 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt set(GMSH_PRIVATE_API ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshConfig.h ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h ${HEADERS}) get_property(IAMCHILD DIRECTORY PROPERTY PARENT_DIRECTORY) -@@ -708,7 +708,7 @@ if(HAVE_FLTK OR ENABLE_GRAPHICS) - endif(HAVE_FLTK OR ENABLE_GRAPHICS) +@@ -709,7 +709,7 @@ if(HAVE_FLTK OR ENABLE_GRAPHICS) + endif() if(ENABLE_ANN) - find_library(ANN_LIB ann PATH_SUFFIXES lib) @@ -19,12 +19,14 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN) if(ENABLE_SYSTEM_CONTRIB AND ANN_LIB AND ANN_INC) message(STATUS "Using system version of ANN") -@@ -722,8 +722,16 @@ if(ENABLE_ANN) - endif(ENABLE_ANN) +@@ -723,9 +723,17 @@ if(ENABLE_ANN) + endif() + endif() - if(ENABLE_BFGS) +-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/lbfgs AND ENABLE_BFGS) - add_subdirectory(contrib/lbfgs) - include_directories(contrib/lbfgs) ++if(ENABLE_BFGS) + find_library(BFGS_LIB lbfgs PATH_SUFFIXES lib) + find_path(BFGS_INC "lbfgs.h" PATH_SUFFIXES include) + if(BFGS_LIB AND BFGS_INC) @@ -36,14 +38,16 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt + include_directories(contrib/lbfgs) + endif(BFGS_LIB AND BFGS_INC) set_config_option(HAVE_BFGS "Bfgs") - endif(ENABLE_BFGS) + endif() -@@ -772,8 +780,16 @@ if(ENABLE_KBIPACK) - endif(ENABLE_KBIPACK) +@@ -777,9 +785,17 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/co + endif() + endif() - if(ENABLE_MATHEX) +-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/MathEx AND ENABLE_MATHEX) - add_subdirectory(contrib/MathEx) - include_directories(contrib/MathEx) ++if(ENABLE_MATHEX) + find_library(MATHEX_LIB mathex PATH_SUFFIXES lib) + find_path(MATHEX_INC "mathex.h" PATH_SUFFIXES src include) + if(MATHEX_LIB AND MATHEX_INC) @@ -55,15 +59,17 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt + include_directories(contrib/MathEx) + endif(MATHEX_LIB AND MATHEX_INC) set_config_option(HAVE_MATHEX "MathEx") - endif(ENABLE_MATHEX) + endif() -@@ -846,9 +862,22 @@ if(HAVE_MESH) - endif(ENABLE_BLOSSOM) +@@ -853,10 +869,23 @@ if(HAVE_MESH) + set_config_option(HAVE_BLOSSOM "Blossom") + endif() - if(ENABLE_NETGEN) +- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Netgen AND ENABLE_NETGEN) - add_subdirectory(contrib/Netgen) - include_directories(contrib/Netgen contrib/Netgen/libsrc/include - contrib/Netgen/nglib) ++ if(ENABLE_NETGEN) + find_library(NETGEN_LIB nglib PATH_SUFFIXES lib) + find_path(NETGEN_INC "nglib.h" PATH_SUFFIXES include/netgen-mesher) + if(NETGEN_LIB AND NETGEN_INC) @@ -82,20 +88,20 @@ diff -rupN gmsh-4.0.6-source/CMakeLists.txt gmsh-4.0.6-source-new/CMakeLists.txt + endif(NETGEN_LIB AND NETGEN_INC) set_config_option(HAVE_NETGEN "Netgen") add_definitions(-DNO_PARALLEL_THREADS -DNOTCL) - endif(ENABLE_NETGEN) -@@ -860,7 +889,7 @@ if(HAVE_MESH) - endif(ENABLE_BAMG) + endif() +@@ -868,7 +897,7 @@ if(HAVE_MESH) + endif() if(ENABLE_MMG3D) - find_library(MMG3D_LIB mmg3dlib4.0 PATH_SUFFIXES lib) + find_library(MMG3D_LIB mmg3d PATH_SUFFIXES lib) find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include) if(ENABLE_SYSTEM_CONTRIB AND MMG3D_LIB AND MMG3D_INC) - message(STATUS "Using system version of MMG3D") -diff -rupN gmsh-4.0.6-source/Mesh/CMakeLists.txt gmsh-4.0.6-source-new/Mesh/CMakeLists.txt ---- gmsh-4.0.6-source/Mesh/CMakeLists.txt 2018-11-12 11:14:58.000000000 +0100 -+++ gmsh-4.0.6-source-new/Mesh/CMakeLists.txt 2018-11-25 22:30:25.203946635 +0100 -@@ -45,6 +45,7 @@ set(SRC + message(STATUS "Using system version of MMG3D") +diff -rupN gmsh-4.0.7-source/Mesh/CMakeLists.txt gmsh-4.0.7-source-new/Mesh/CMakeLists.txt +--- gmsh-4.0.7-source/Mesh/CMakeLists.txt 2018-12-09 11:13:06.000000000 +0100 ++++ gmsh-4.0.7-source-new/Mesh/CMakeLists.txt 2018-12-10 16:42:02.481728810 +0100 +@@ -42,6 +42,7 @@ set(SRC yamakawa.cpp Field.cpp surfaceFiller.cpp diff --git a/sources b/sources index a53be56..a9874a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.0.6-source-fedora.tar.xz) = 9226a78af0417a6ef758e6e39008c4d21878b4ec0a4bf59f9d3fce474af55c589efc77bdea425cf4d274d1d0e9f806388561ce30dcd223a6b8a08d058cd62c88 +SHA512 (gmsh-4.0.7-source-fedora.tar.xz) = bf4dc953e109db73ebd0f5d543a55b6bae692c15774d75d259cd24d767d47c2b95a837d9203d007a43b4829d299797abcc05b450ec810345173206975bd78323