From ac057cad5ee359eeb3f5abb92e36e14b9c79a8c4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jan 15 2019 10:39:57 +0000 Subject: Update to 4.1.0 --- diff --git a/.gitignore b/.gitignore index 2bf2730..b6fb024 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /gmsh-4.0.5-source-fedora.tar.xz /gmsh-4.0.6-source-fedora.tar.xz /gmsh-4.0.7-source-fedora.tar.xz +/gmsh-4.1.0-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index fe9b480..75fbaee 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,7 +3,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.0.7 +Version: 4.1.0 Release: 1%{?dist} License: GPLv2+ @@ -381,7 +381,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files libs %license LICENSE.txt -%{_libdir}/libgmsh.so.4.0* +%{_libdir}/libgmsh.so.4.1* %files -n python3-%{name} %{python3_sitelib}/gmsh.py @@ -405,7 +405,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files openmpi-libs %license LICENSE.txt -%{_libdir}/openmpi/lib/libgmsh.so.4.0* +%{_libdir}/openmpi/lib/libgmsh.so.4.1* %endif %if %{with mpich} @@ -423,11 +423,14 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %files mpich-libs %license LICENSE.txt -%{_libdir}/mpich/lib/libgmsh.so.4.0* +%{_libdir}/mpich/lib/libgmsh.so.4.1* %endif %changelog +* Mon Jan 14 2019 Sandro Mani - 4.1.0-1 +- Update to 4.1.0 + * Mon Dec 10 2018 Sandro Mani - 4.0.7-1 - Update to 4.0.7 diff --git a/gmsh_alglib.patch b/gmsh_alglib.patch index 9b823d6..3075a40 100644 --- a/gmsh_alglib.patch +++ b/gmsh_alglib.patch @@ -1,6 +1,6 @@ -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 +diff -rupN gmsh-4.1.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-4.1.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp +--- gmsh-4.1.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp 2019-01-14 23:36:00.034389836 +0100 @@ -41,11 +41,11 @@ static int NEVAL = 0; #if defined(HAVE_BFGS) @@ -18,9 +18,9 @@ diff -rupN gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-4.0. static inline double compute_f(double v, double barrier) { -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 +diff -rupN gmsh-4.1.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-4.1.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h +--- gmsh-4.1.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h 2019-01-14 23:36:00.035389837 +0100 @@ -35,7 +35,7 @@ #if defined(HAVE_BFGS) @@ -30,9 +30,9 @@ diff -rupN gmsh-4.0.7-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-4.0.7- class OptHOM { -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 +diff -rupN gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp +--- gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOpt.cpp 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp 2019-01-14 23:36:00.035389837 +0100 @@ -35,11 +35,11 @@ #if defined(HAVE_BFGS) @@ -50,9 +50,9 @@ diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.0.7-source namespace { -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 +diff -rupN gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOpt.h +--- gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOpt.h 2018-10-21 12:15:16.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOpt.h 2019-01-14 23:36:00.035389837 +0100 @@ -39,7 +39,7 @@ #if defined(HAVE_BFGS) @@ -62,9 +62,9 @@ diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.0.7-source-n class MeshOptParameters; -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 +diff -rupN gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h +--- gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h 2017-10-03 22:01:51.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h 2019-01-14 23:36:00.035389837 +0100 @@ -4,7 +4,7 @@ #define _MESHOPTOBJCONTRIB_H_ @@ -74,9 +74,9 @@ diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-4.0. #include "MeshOptCommon.h" -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 +diff -rupN gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h +--- gmsh-4.1.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2017-10-03 22:01:51.000000000 +0200 ++++ gmsh-4.1.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h 2019-01-14 23:36:00.035389837 +0100 @@ -5,7 +5,7 @@ #include @@ -86,9 +86,9 @@ diff -rupN gmsh-4.0.7-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gm class ObjContrib; class Patch; -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 +diff -rupN gmsh-4.1.0-source/Geo/GFace.cpp gmsh-4.1.0-source-new/Geo/GFace.cpp +--- gmsh-4.1.0-source/Geo/GFace.cpp 2018-12-29 15:02:14.000000000 +0100 ++++ gmsh-4.1.0-source-new/Geo/GFace.cpp 2019-01-14 23:36:00.036389839 +0100 @@ -27,8 +27,8 @@ #endif diff --git a/gmsh_build.patch b/gmsh_build.patch index 50caa1d..8c55f30 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -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 +diff -rupN gmsh-4.1.0-source/Common/CommandLine.cpp gmsh-4.1.0-source-new/Common/CommandLine.cpp +--- gmsh-4.1.0-source/Common/CommandLine.cpp 2019-01-14 23:36:00.651390922 +0100 ++++ gmsh-4.1.0-source-new/Common/CommandLine.cpp 2019-01-14 23:36:00.655390929 +0100 @@ -22,15 +22,6 @@ #include "GmshGlobal.h" #include "StringUtils.h" @@ -33,12 +33,12 @@ diff -rupN gmsh-4.0.7-source/Common/CommandLine.cpp gmsh-4.0.7-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.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 +diff -rupN gmsh-4.1.0-source/Fltk/helpWindow.cpp gmsh-4.1.0-source-new/Fltk/helpWindow.cpp +--- gmsh-4.1.0-source/Fltk/helpWindow.cpp 2019-01-14 23:36:00.651390922 +0100 ++++ gmsh-4.1.0-source-new/Fltk/helpWindow.cpp 2019-01-14 23:36:00.656390930 +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 + // issues on https://gitlab.onelab.info/gmsh/gmsh/issues. +#include "GmshConfig.h" + @@ -67,9 +67,9 @@ diff -rupN gmsh-4.0.7-source/Fltk/helpWindow.cpp gmsh-4.0.7-source-new/Fltk/help static const char *help_link(Fl_Widget *w, const char *uri) { fl_open_uri(uri); -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 +diff -rupN gmsh-4.1.0-source/Geo/GModelIO_MED.cpp gmsh-4.1.0-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.1.0-source/Geo/GModelIO_MED.cpp 2019-01-14 23:36:00.651390922 +0100 ++++ gmsh-4.1.0-source-new/Geo/GModelIO_MED.cpp 2019-01-14 23:36:00.656390930 +0100 @@ -26,9 +26,7 @@ #include "discreteVertex.h" #include "Context.h" @@ -78,11 +78,11 @@ diff -rupN gmsh-4.0.7-source/Geo/GModelIO_MED.cpp gmsh-4.0.7-source-new/Geo/GMod #include -} - #if(MED_MAJOR_NUM == 3) + #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the -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 +diff -rupN gmsh-4.1.0-source/Post/PViewDataGModelIO.cpp gmsh-4.1.0-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.1.0-source/Post/PViewDataGModelIO.cpp 2019-01-14 23:36:00.652390923 +0100 ++++ gmsh-4.1.0-source-new/Post/PViewDataGModelIO.cpp 2019-01-14 23:36:00.657390932 +0100 @@ -469,9 +469,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) @@ -91,5 +91,5 @@ diff -rupN gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp gmsh-4.0.7-source-new/Po #include -} - #if(MED_MAJOR_NUM == 3) + #if(MED_MAJOR_NUM >= 3) // To avoid too many ifdefs below we use defines for the bits of the diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch index b56d0e6..c4a6742 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,13 +1,13 @@ -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 +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-14 23:36:00.348390388 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:36:00.350390392 +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}) + opt(CGNS "Enable CGNS mesh import (experimental)" ${DEFAULT}) opt(CAIRO "Enable Cairo to render fonts (experimental)" ${DEFAULT}) --opt(CXX11 "Enable C++11" ${DEFAULT}) -+opt(CXX14 "Enable C++14" ${DEFAULT}) - opt(C99 "Enable C99" ${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}) @@ -291,13 +291,13 @@ if(ENABLE_OPENMP) @@ -31,7 +31,7 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt if(ENABLE_C99) # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99) -@@ -1455,10 +1455,10 @@ if(ENABLE_REVOROPT) +@@ -1469,10 +1469,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.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt endif() else() message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, Ann and BFGS") -@@ -1632,7 +1632,7 @@ if(ENABLE_BUILD_ANDROID) +@@ -1646,7 +1646,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 7e1ba60..b91fa00 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -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() +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-14 23:36:00.949391446 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:36:00.951391449 +0100 +@@ -1792,7 +1792,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 8e4c372..be1bd56 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -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() +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-14 23:36:00.651390922 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:36:00.805391193 +0100 +@@ -1801,7 +1801,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 f11b70a..c669d5e 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,7 +1,7 @@ -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) +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-14 23:36:00.505390665 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:36:00.508390670 +0100 +@@ -932,7 +932,7 @@ if(ENABLE_MED OR ENABLE_CGNS) set(HDF5_LIB "${HDF5_C_LIBRARIES}") list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS}) if(ENABLE_MED) @@ -10,9 +10,9 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt if(MED_LIB) set_config_option(HAVE_MED "Med") list(APPEND EXTERNAL_LIBRARIES ${MED_LIB}) -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 +diff -rupN gmsh-4.1.0-source/Common/CommandLine.cpp gmsh-4.1.0-source-new/Common/CommandLine.cpp +--- gmsh-4.1.0-source/Common/CommandLine.cpp 2018-12-29 15:02:14.000000000 +0100 ++++ gmsh-4.1.0-source-new/Common/CommandLine.cpp 2019-01-14 23:36:00.508390670 +0100 @@ -40,7 +40,7 @@ #endif @@ -22,9 +22,9 @@ diff -rupN gmsh-4.0.7-source/Common/CommandLine.cpp gmsh-4.0.7-source-new/Common #endif #if defined(HAVE_POST) -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 +diff -rupN gmsh-4.1.0-source/Fltk/helpWindow.cpp gmsh-4.1.0-source-new/Fltk/helpWindow.cpp +--- gmsh-4.1.0-source/Fltk/helpWindow.cpp 2018-12-29 15:02:14.000000000 +0100 ++++ gmsh-4.1.0-source-new/Fltk/helpWindow.cpp 2019-01-14 23:36:00.508390670 +0100 @@ -34,7 +34,7 @@ #endif @@ -34,9 +34,9 @@ diff -rupN gmsh-4.0.7-source/Fltk/helpWindow.cpp gmsh-4.0.7-source-new/Fltk/help #endif static const char *help_link(Fl_Widget *w, const char *uri) -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 +diff -rupN gmsh-4.1.0-source/Geo/GModelIO_MED.cpp gmsh-4.1.0-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.1.0-source/Geo/GModelIO_MED.cpp 2018-12-29 15:02:14.000000000 +0100 ++++ gmsh-4.1.0-source-new/Geo/GModelIO_MED.cpp 2019-01-14 23:36:00.509390672 +0100 @@ -27,7 +27,7 @@ #include "Context.h" @@ -45,10 +45,10 @@ diff -rupN gmsh-4.0.7-source/Geo/GModelIO_MED.cpp gmsh-4.0.7-source-new/Geo/GMod +#include } - #if(MED_MAJOR_NUM == 3) -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 + #if(MED_MAJOR_NUM >= 3) +diff -rupN gmsh-4.1.0-source/Post/PViewDataGModelIO.cpp gmsh-4.1.0-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.1.0-source/Post/PViewDataGModelIO.cpp 2018-12-29 15:02:14.000000000 +0100 ++++ gmsh-4.1.0-source-new/Post/PViewDataGModelIO.cpp 2019-01-14 23:36:00.509390672 +0100 @@ -470,7 +470,7 @@ void PViewDataGModel::importLists(int N[ #if defined(HAVE_MED) @@ -57,4 +57,4 @@ diff -rupN gmsh-4.0.7-source/Post/PViewDataGModelIO.cpp gmsh-4.0.7-source-new/Po +#include } - #if(MED_MAJOR_NUM == 3) + #if(MED_MAJOR_NUM >= 3) diff --git a/gmsh_python.patch b/gmsh_python.patch index d2cc715..5a2f8c3 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -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() +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-14 23:36:00.032389832 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:36:00.201390130 +0100 +@@ -1773,6 +1773,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt # FIXME: change this once we understand rpaths if(APPLE) if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) -@@ -1780,11 +1782,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1794,11 +1796,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB) @@ -24,9 +24,9 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-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.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 +diff -rupN gmsh-4.1.0-source/Common/GmshMessage.cpp gmsh-4.1.0-source-new/Common/GmshMessage.cpp +--- gmsh-4.1.0-source/Common/GmshMessage.cpp 2019-01-08 22:41:13.000000000 +0100 ++++ gmsh-4.1.0-source-new/Common/GmshMessage.cpp 2019-01-14 23:36:00.202390131 +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 141fa5e..c86c9da 100644 --- a/gmsh_unbundle.patch +++ b/gmsh_unbundle.patch @@ -1,6 +1,6 @@ -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 +diff -rupN gmsh-4.1.0-source/CMakeLists.txt gmsh-4.1.0-source-new/CMakeLists.txt +--- gmsh-4.1.0-source/CMakeLists.txt 2019-01-13 10:28:07.000000000 +0100 ++++ gmsh-4.1.0-source-new/CMakeLists.txt 2019-01-14 23:35:59.883389570 +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 @@ -40,7 +40,7 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt set_config_option(HAVE_BFGS "Bfgs") endif() -@@ -777,9 +785,17 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/co +@@ -791,9 +799,17 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/co endif() endif() @@ -61,7 +61,7 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt set_config_option(HAVE_MATHEX "MathEx") endif() -@@ -853,10 +869,23 @@ if(HAVE_MESH) +@@ -867,10 +883,23 @@ if(HAVE_MESH) set_config_option(HAVE_BLOSSOM "Blossom") endif() @@ -89,7 +89,7 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt set_config_option(HAVE_NETGEN "Netgen") add_definitions(-DNO_PARALLEL_THREADS -DNOTCL) endif() -@@ -868,7 +897,7 @@ if(HAVE_MESH) +@@ -882,7 +911,7 @@ if(HAVE_MESH) endif() if(ENABLE_MMG3D) @@ -98,13 +98,13 @@ diff -rupN gmsh-4.0.7-source/CMakeLists.txt gmsh-4.0.7-source-new/CMakeLists.txt 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.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 +diff -rupN gmsh-4.1.0-source/Mesh/CMakeLists.txt gmsh-4.1.0-source-new/Mesh/CMakeLists.txt +--- gmsh-4.1.0-source/Mesh/CMakeLists.txt 2018-12-29 19:32:53.000000000 +0100 ++++ gmsh-4.1.0-source-new/Mesh/CMakeLists.txt 2019-01-14 23:35:59.883389570 +0100 +@@ -30,6 +30,7 @@ set(SRC + DivideAndConquer.cpp Field.cpp - surfaceFiller.cpp + filterElements.cpp + nglib_gmsh.cpp ) diff --git a/sources b/sources index a9874a8..dd3566b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.0.7-source-fedora.tar.xz) = bf4dc953e109db73ebd0f5d543a55b6bae692c15774d75d259cd24d767d47c2b95a837d9203d007a43b4829d299797abcc05b450ec810345173206975bd78323 +SHA512 (gmsh-4.1.0-source-fedora.tar.xz) = 3816205f66ad541b5fee545f901c3601eb90c51fe485c13e014826c7d87beb3666eb6d3646a4feeda8528ab7cec0a45d7b1bf968bad4954ba489a49549bbf0ed