diff --git a/.gitignore b/.gitignore index b6078e4..ba19a79 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /gmsh-4.1.5-source-fedora.tar.xz /gmsh-4.2.0-source-fedora.tar.xz /gmsh-4.2.1-source-fedora.tar.xz +/gmsh-4.2.2-source-fedora.tar.xz diff --git a/gmsh.spec b/gmsh.spec index 187b58b..2d930a3 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -3,8 +3,8 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} License: GPLv2+ URL: http://geuz.org/gmsh/ @@ -13,23 +13,18 @@ URL: http://geuz.org/gmsh/ Source0: %{name}-%{version}-source-fedora.tar.xz Source1: %{name}.desktop -# Unbundle most of the bundled libraries, see comments in %%prep -Patch0: gmsh_unbundle.patch -# Fix include paths for alglib headers -Patch1: gmsh_alglib.patch # Install onelab.py and gmsh.py into the python site-packages directory -Patch2: gmsh_python.patch +Patch0: gmsh_python.patch # Use c++14 (needed by netgen component) -Patch3: gmsh_c++14.patch +Patch1: gmsh_c++14.patch # Adapt med.h include path -Patch4: gmsh_med.patch +Patch2: gmsh_med.patch # Fix macro collision with symbol by re-ordering includes -# Fix header in extern C block which causes conflicting declarations -Patch5: gmsh_build.patch +Patch3: gmsh_build.patch # Install Julia API to share/gmsh -Patch6: gmsh_julia.patch +Patch4: gmsh_julia.patch # Remove odd install of gmsh shared library -Patch7: gmsh_install.patch +Patch5: gmsh_install.patch BuildRequires: alglib-devel BuildRequires: ann-devel @@ -383,6 +378,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Wed Mar 13 2019 Sandro Mani - 4.2.2-1 +- Update to 4.2.2 + * Tue Mar 12 2019 Sandro Mani - 4.2.1-3 - Rebuild (cgnslib) diff --git a/gmsh_alglib.patch b/gmsh_alglib.patch deleted file mode 100644 index 2873210..0000000 --- a/gmsh_alglib.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/alglibinternal.cpp gmsh-4.2.1-source-new/contrib/lbfgs/alglibinternal.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/alglibinternal.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/alglibinternal.cpp 2019-03-07 21:27:55.174342831 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "alglibinternal.h" -+#include -+#include - - // disable some irrelevant warnings - #if (AE_COMPILER==AE_MSVC) -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/alglibinternal.h gmsh-4.2.1-source-new/contrib/lbfgs/alglibinternal.h ---- gmsh-4.2.1-source/contrib/lbfgs/alglibinternal.h 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/alglibinternal.h 2019-03-07 21:27:55.175342737 +0100 -@@ -18,7 +18,7 @@ http://www.fsf.org/licensing/licenses - *************************************************************************/ - #ifndef _alglibinternal_pkg_h - #define _alglibinternal_pkg_h --#include "ap.h" -+#include - - - ///////////////////////////////////////////////////////////////////////// -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/alglibmisc.cpp gmsh-4.2.1-source-new/contrib/lbfgs/alglibmisc.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/alglibmisc.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/alglibmisc.cpp 2019-03-07 21:27:55.175342737 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "alglibmisc.h" -+#include -+#include - - // disable some irrelevant warnings - #if (AE_COMPILER==AE_MSVC) -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/alglibmisc.h gmsh-4.2.1-source-new/contrib/lbfgs/alglibmisc.h ---- gmsh-4.2.1-source/contrib/lbfgs/alglibmisc.h 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/alglibmisc.h 2019-03-07 21:27:55.176342643 +0100 -@@ -18,8 +18,8 @@ http://www.fsf.org/licensing/licenses - *************************************************************************/ - #ifndef _alglibmisc_pkg_h - #define _alglibmisc_pkg_h --#include "ap.h" --#include "alglibinternal.h" -+#include -+#include - - ///////////////////////////////////////////////////////////////////////// - // -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/ap.cpp gmsh-4.2.1-source-new/contrib/lbfgs/ap.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/ap.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/ap.cpp 2019-03-07 21:27:55.177342549 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "ap.h" -+#include -+#include - #include - #include - using namespace std; -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/linalg.cpp gmsh-4.2.1-source-new/contrib/lbfgs/linalg.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/linalg.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/linalg.cpp 2019-03-07 21:27:55.182342079 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "linalg.h" -+#include -+#include - - // disable some irrelevant warnings - #if (AE_COMPILER==AE_MSVC) -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/linalg.h gmsh-4.2.1-source-new/contrib/lbfgs/linalg.h ---- gmsh-4.2.1-source/contrib/lbfgs/linalg.h 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/linalg.h 2019-03-07 21:27:55.183341985 +0100 -@@ -18,9 +18,9 @@ http://www.fsf.org/licensing/licenses - *************************************************************************/ - #ifndef _linalg_pkg_h - #define _linalg_pkg_h --#include "ap.h" --#include "alglibinternal.h" --#include "alglibmisc.h" -+#include -+#include -+#include - - ///////////////////////////////////////////////////////////////////////// - // -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/optimization.cpp gmsh-4.2.1-source-new/contrib/lbfgs/optimization.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/optimization.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/optimization.cpp 2019-03-07 21:27:55.186341703 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "optimization.h" -+#include -+#include - - // disable some irrelevant warnings - #if (AE_COMPILER==AE_MSVC) -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/optimization.h gmsh-4.2.1-source-new/contrib/lbfgs/optimization.h ---- gmsh-4.2.1-source/contrib/lbfgs/optimization.h 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/optimization.h 2019-03-07 21:27:55.187341609 +0100 -@@ -18,11 +18,11 @@ http://www.fsf.org/licensing/licenses - *************************************************************************/ - #ifndef _optimization_pkg_h - #define _optimization_pkg_h --#include "ap.h" --#include "alglibinternal.h" --#include "alglibmisc.h" --#include "linalg.h" --#include "solvers.h" -+#include -+#include -+#include -+#include -+#include - - ///////////////////////////////////////////////////////////////////////// - // -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/solvers.cpp gmsh-4.2.1-source-new/contrib/lbfgs/solvers.cpp ---- gmsh-4.2.1-source/contrib/lbfgs/solvers.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/solvers.cpp 2019-03-07 21:27:55.188341515 +0100 -@@ -16,8 +16,8 @@ A copy of the GNU General Public License - http://www.fsf.org/licensing/licenses - >>> END OF LICENSE >>> - *************************************************************************/ --#include "stdafx.h" --#include "solvers.h" -+#include -+#include - - // disable some irrelevant warnings - #if (AE_COMPILER==AE_MSVC) -diff -rupN gmsh-4.2.1-source/contrib/lbfgs/solvers.h gmsh-4.2.1-source-new/contrib/lbfgs/solvers.h ---- gmsh-4.2.1-source/contrib/lbfgs/solvers.h 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/lbfgs/solvers.h 2019-03-07 21:27:55.188341515 +0100 -@@ -18,10 +18,10 @@ http://www.fsf.org/licensing/licenses - *************************************************************************/ - #ifndef _solvers_pkg_h - #define _solvers_pkg_h --#include "ap.h" --#include "alglibinternal.h" --#include "linalg.h" --#include "alglibmisc.h" -+#include -+#include -+#include -+#include - - ///////////////////////////////////////////////////////////////////////// - // -diff -rupN gmsh-4.2.1-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-4.2.1-source-new/contrib/MeshOptimizer/MeshOpt.cpp ---- gmsh-4.2.1-source/contrib/MeshOptimizer/MeshOpt.cpp 2019-02-16 10:18:07.000000000 +0100 -+++ gmsh-4.2.1-source-new/contrib/MeshOptimizer/MeshOpt.cpp 2019-03-07 21:27:55.188341515 +0100 -@@ -36,11 +36,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 - - namespace { - -diff -rupN gmsh-4.2.1-source/contrib/MeshOptimizer/MeshOpt.h gmsh-4.2.1-source-new/contrib/MeshOptimizer/MeshOpt.h ---- gmsh-4.2.1-source/contrib/MeshOptimizer/MeshOpt.h 2019-02-24 11:49:47.000000000 +0100 -+++ gmsh-4.2.1-source-new/contrib/MeshOptimizer/MeshOpt.h 2019-03-07 21:27:55.189341421 +0100 -@@ -39,7 +39,7 @@ - - #if defined(HAVE_BFGS) - --#include "ap.h" -+#include - - class MeshOptParameters; - -diff -rupN gmsh-4.2.1-source/contrib/MeshOptimizer/ObjContrib.h gmsh-4.2.1-source-new/contrib/MeshOptimizer/ObjContrib.h ---- gmsh-4.2.1-source/contrib/MeshOptimizer/ObjContrib.h 2019-02-24 11:49:47.000000000 +0100 -+++ gmsh-4.2.1-source-new/contrib/MeshOptimizer/ObjContrib.h 2019-03-07 21:27:55.189341421 +0100 -@@ -26,7 +26,7 @@ - #define OBJ_CONTRIB_H - - #include --#include "ap.h" -+#include - #include "MeshOptCommon.h" - - class Patch; -diff -rupN gmsh-4.2.1-source/contrib/MeshOptimizer/ObjectiveFunction.h gmsh-4.2.1-source-new/contrib/MeshOptimizer/ObjectiveFunction.h ---- gmsh-4.2.1-source/contrib/MeshOptimizer/ObjectiveFunction.h 2019-02-24 11:49:47.000000000 +0100 -+++ gmsh-4.2.1-source-new/contrib/MeshOptimizer/ObjectiveFunction.h 2019-03-07 21:27:55.189341421 +0100 -@@ -27,7 +27,7 @@ - - #include - #include --#include "ap.h" -+#include - - class ObjContrib; - class Patch; -diff -rupN gmsh-4.2.1-source/contrib/Revoropt/include/Revoropt/Solver/alglib_cg.hpp gmsh-4.2.1-source-new/contrib/Revoropt/include/Revoropt/Solver/alglib_cg.hpp ---- gmsh-4.2.1-source/contrib/Revoropt/include/Revoropt/Solver/alglib_cg.hpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/Revoropt/include/Revoropt/Solver/alglib_cg.hpp 2019-03-07 21:27:55.189341421 +0100 -@@ -11,7 +11,7 @@ - #ifndef _REVOROPT_SOLVER_ALGLIB_CG_WRAPPER_H_ - #define _REVOROPT_SOLVER_ALGLIB_CG_WRAPPER_H_ - --#include -+#include - - namespace Revoropt { - namespace Solver { -diff -rupN gmsh-4.2.1-source/contrib/Revoropt/include/Revoropt/Solver/alglib_lbfgs.hpp gmsh-4.2.1-source-new/contrib/Revoropt/include/Revoropt/Solver/alglib_lbfgs.hpp ---- gmsh-4.2.1-source/contrib/Revoropt/include/Revoropt/Solver/alglib_lbfgs.hpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/Revoropt/include/Revoropt/Solver/alglib_lbfgs.hpp 2019-03-07 21:27:55.189341421 +0100 -@@ -11,8 +11,7 @@ - #ifndef _REVOROPT_SOLVER_ALGLIB_LBFGS_WRAPPER_HPP_ - #define _REVOROPT_SOLVER_ALGLIB_LBFGS_WRAPPER_HPP_ - --//#include --#include -+#include - - namespace Revoropt { - namespace Solver { -diff -rupN gmsh-4.2.1-source/contrib/zipper/example.cpp gmsh-4.2.1-source-new/contrib/zipper/example.cpp ---- gmsh-4.2.1-source/contrib/zipper/example.cpp 2017-10-03 22:01:52.000000000 +0200 -+++ gmsh-4.2.1-source-new/contrib/zipper/example.cpp 2019-03-07 21:27:55.190341327 +0100 -@@ -1,7 +1,7 @@ - // ZipExample.cpp : Defines the entry point for the console application. - // - --#include "stdafx.h" -+#include - #include "zipper.h" - #include "unzipper.h" - #include -diff -rupN gmsh-4.2.1-source/Geo/GFace.cpp gmsh-4.2.1-source-new/Geo/GFace.cpp ---- gmsh-4.2.1-source/Geo/GFace.cpp 2019-03-04 18:10:27.000000000 +0100 -+++ gmsh-4.2.1-source-new/Geo/GFace.cpp 2019-03-07 21:27:55.190341327 +0100 -@@ -27,8 +27,8 @@ - #endif - - #if defined(HAVE_BFGS) --#include "stdafx.h" --#include "optimization.h" -+#include -+#include - #endif - - // TODO C++11 remove macro diff --git a/gmsh_build.patch b/gmsh_build.patch index 4f80676..3e9d98c 100644 --- a/gmsh_build.patch +++ b/gmsh_build.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.2.1-source/Common/CommandLine.cpp gmsh-4.2.1-source-new/Common/CommandLine.cpp ---- gmsh-4.2.1-source/Common/CommandLine.cpp 2019-03-07 21:27:55.749288778 +0100 -+++ gmsh-4.2.1-source-new/Common/CommandLine.cpp 2019-03-07 21:27:55.752288496 +0100 +diff -rupN gmsh-4.2.2-source/Common/CommandLine.cpp gmsh-4.2.2-source-new/Common/CommandLine.cpp +--- gmsh-4.2.2-source/Common/CommandLine.cpp 2019-03-08 11:12:04.000000000 +0100 ++++ gmsh-4.2.2-source-new/Common/CommandLine.cpp 2019-03-13 15:53:36.986316406 +0100 @@ -22,15 +22,6 @@ #include "GmshGlobal.h" #include "StringUtils.h" @@ -33,9 +33,9 @@ diff -rupN gmsh-4.2.1-source/Common/CommandLine.cpp gmsh-4.2.1-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.2.1-source/Fltk/helpWindow.cpp gmsh-4.2.1-source-new/Fltk/helpWindow.cpp ---- gmsh-4.2.1-source/Fltk/helpWindow.cpp 2019-03-07 21:27:55.749288778 +0100 -+++ gmsh-4.2.1-source-new/Fltk/helpWindow.cpp 2019-03-07 21:27:55.753288402 +0100 +diff -rupN gmsh-4.2.2-source/Fltk/helpWindow.cpp gmsh-4.2.2-source-new/Fltk/helpWindow.cpp +--- gmsh-4.2.2-source/Fltk/helpWindow.cpp 2019-03-08 11:12:04.000000000 +0100 ++++ gmsh-4.2.2-source-new/Fltk/helpWindow.cpp 2019-03-13 15:53:36.987316405 +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. @@ -56,40 +56,3 @@ diff -rupN gmsh-4.2.1-source/Fltk/helpWindow.cpp gmsh-4.2.1-source-new/Fltk/help #include "FlGui.h" #include "inputValue.h" #include "helpWindow.h" -@@ -33,10 +38,6 @@ - #include "Standard_Version.hxx" - #endif - --#if defined(HAVE_MED) --#include --#endif -- - static const char *help_link(Fl_Widget *w, const char *uri) - { - fl_open_uri(uri); -diff -rupN gmsh-4.2.1-source/Geo/GModelIO_MED.cpp gmsh-4.2.1-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.2.1-source/Geo/GModelIO_MED.cpp 2019-03-07 21:27:55.749288778 +0100 -+++ gmsh-4.2.1-source-new/Geo/GModelIO_MED.cpp 2019-03-07 21:27:55.753288402 +0100 -@@ -26,9 +26,7 @@ - #include "discreteVertex.h" - #include "Context.h" - --extern "C" { - #include --} - - #if(MED_MAJOR_NUM >= 3) - // To avoid too many ifdefs below we use defines for the bits of the -diff -rupN gmsh-4.2.1-source/Post/PViewDataGModelIO.cpp gmsh-4.2.1-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.2.1-source/Post/PViewDataGModelIO.cpp 2019-03-07 21:27:55.749288778 +0100 -+++ gmsh-4.2.1-source-new/Post/PViewDataGModelIO.cpp 2019-03-07 21:27:55.753288402 +0100 -@@ -469,9 +469,7 @@ void PViewDataGModel::importLists(int N[ - - #if defined(HAVE_MED) - --extern "C" { - #include --} - - #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 4961ca2..e3c35c1 100644 --- a/gmsh_c++14.patch +++ b/gmsh_c++14.patch @@ -1,6 +1,6 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-07 21:27:55.467315287 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:55.471314912 +0100 +diff -rupN gmsh-4.2.2-source/CMakeLists.txt gmsh-4.2.2-source-new/CMakeLists.txt +--- gmsh-4.2.2-source/CMakeLists.txt 2019-03-13 13:46:52.071374209 +0100 ++++ gmsh-4.2.2-source-new/CMakeLists.txt 2019-03-13 13:46:52.073374211 +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 (experimental)" ${DEFAULT}) @@ -31,7 +31,7 @@ diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt if(ENABLE_C99) # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99) -@@ -1505,10 +1505,10 @@ if(ENABLE_REVOROPT) +@@ -1491,10 +1491,10 @@ if(ENABLE_REVOROPT) get_source_file_property(PROP Plugin/CVTRemesh.cpp COMPILE_FLAGS) if(PROP) set_source_files_properties(Plugin/CVTRemesh.cpp PROPERTIES @@ -43,8 +43,8 @@ diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt + COMPILE_FLAGS "-std=c++14") endif() else() - message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, Ann and BFGS") -@@ -1688,7 +1688,7 @@ if(ENABLE_BUILD_ANDROID) + message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, ANN and ALGLIB") +@@ -1674,7 +1674,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 f3468b0..f607e20 100644 --- a/gmsh_install.patch +++ b/gmsh_install.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-07 21:27:56.030262376 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:56.033262096 +0100 -@@ -1834,7 +1834,7 @@ endif() +diff -rupN gmsh-4.2.2-source/CMakeLists.txt gmsh-4.2.2-source-new/CMakeLists.txt +--- gmsh-4.2.2-source/CMakeLists.txt 2019-03-13 13:46:52.304374512 +0100 ++++ gmsh-4.2.2-source-new/CMakeLists.txt 2019-03-13 13:46:52.306374514 +0100 +@@ -1820,7 +1820,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 69dc8f2..2c3e814 100644 --- a/gmsh_julia.patch +++ b/gmsh_julia.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-07 21:27:55.748288872 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:55.886275899 +0100 -@@ -1843,7 +1843,7 @@ endif() +diff -rupN gmsh-4.2.2-source/CMakeLists.txt gmsh-4.2.2-source-new/CMakeLists.txt +--- gmsh-4.2.2-source/CMakeLists.txt 2019-03-13 13:46:52.189374362 +0100 ++++ gmsh-4.2.2-source-new/CMakeLists.txt 2019-03-13 13:46:52.192374366 +0100 +@@ -1829,7 +1829,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 dabf7d3..aa864f2 100644 --- a/gmsh_med.patch +++ b/gmsh_med.patch @@ -1,60 +1,48 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-07 21:27:55.598302973 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:55.600302785 +0100 -@@ -945,7 +945,7 @@ if(ENABLE_MED OR ENABLE_CGNS) - set(HDF5_LIB "${HDF5_C_LIBRARIES}") - list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS}) - if(ENABLE_MED) -- find_library(MED_LIB med) -+ find_library(MED_LIB medC) - if(MED_LIB) - set_config_option(HAVE_MED "Med") - list(APPEND EXTERNAL_LIBRARIES ${MED_LIB}) -diff -rupN gmsh-4.2.1-source/Common/CommandLine.cpp gmsh-4.2.1-source-new/Common/CommandLine.cpp ---- gmsh-4.2.1-source/Common/CommandLine.cpp 2019-02-22 10:07:06.000000000 +0100 -+++ gmsh-4.2.1-source-new/Common/CommandLine.cpp 2019-03-07 21:27:55.600302785 +0100 +diff -rupN gmsh-4.2.2-source/Common/CommandLine.cpp gmsh-4.2.2-source-new/Common/CommandLine.cpp +--- gmsh-4.2.2-source/Common/CommandLine.cpp 2019-03-08 11:12:04.000000000 +0100 ++++ gmsh-4.2.2-source-new/Common/CommandLine.cpp 2019-03-13 14:10:27.413575452 +0100 @@ -40,7 +40,7 @@ #endif #if defined(HAVE_MED) --#include "med.h" +-#include +#include #endif #if defined(HAVE_POST) -diff -rupN gmsh-4.2.1-source/Fltk/helpWindow.cpp gmsh-4.2.1-source-new/Fltk/helpWindow.cpp ---- gmsh-4.2.1-source/Fltk/helpWindow.cpp 2019-02-17 20:35:58.000000000 +0100 -+++ gmsh-4.2.1-source-new/Fltk/helpWindow.cpp 2019-03-07 21:27:55.601302691 +0100 +diff -rupN gmsh-4.2.2-source/Fltk/helpWindow.cpp gmsh-4.2.2-source-new/Fltk/helpWindow.cpp +--- gmsh-4.2.2-source/Fltk/helpWindow.cpp 2019-03-08 11:12:04.000000000 +0100 ++++ gmsh-4.2.2-source-new/Fltk/helpWindow.cpp 2019-03-13 14:10:54.462539018 +0100 @@ -34,7 +34,7 @@ #endif #if defined(HAVE_MED) --#include "med.h" +-#include +#include #endif static const char *help_link(Fl_Widget *w, const char *uri) -diff -rupN gmsh-4.2.1-source/Geo/GModelIO_MED.cpp gmsh-4.2.1-source-new/Geo/GModelIO_MED.cpp ---- gmsh-4.2.1-source/Geo/GModelIO_MED.cpp 2019-03-01 20:01:51.000000000 +0100 -+++ gmsh-4.2.1-source-new/Geo/GModelIO_MED.cpp 2019-03-07 21:27:55.601302691 +0100 -@@ -27,7 +27,7 @@ +diff -rupN gmsh-4.2.2-source/Geo/GModelIO_MED.cpp gmsh-4.2.2-source-new/Geo/GModelIO_MED.cpp +--- gmsh-4.2.2-source/Geo/GModelIO_MED.cpp 2019-03-08 18:30:27.000000000 +0100 ++++ gmsh-4.2.2-source-new/Geo/GModelIO_MED.cpp 2019-03-13 14:11:17.152508268 +0100 +@@ -26,7 +26,7 @@ + #include "discreteVertex.h" #include "Context.h" - extern "C" { -#include +#include - } #if(MED_MAJOR_NUM >= 3) -diff -rupN gmsh-4.2.1-source/Post/PViewDataGModelIO.cpp gmsh-4.2.1-source-new/Post/PViewDataGModelIO.cpp ---- gmsh-4.2.1-source/Post/PViewDataGModelIO.cpp 2019-03-01 13:32:46.000000000 +0100 -+++ gmsh-4.2.1-source-new/Post/PViewDataGModelIO.cpp 2019-03-07 21:27:55.601302691 +0100 -@@ -470,7 +470,7 @@ void PViewDataGModel::importLists(int N[ + // To avoid too many ifdefs below we use defines for the bits of the +diff -rupN gmsh-4.2.2-source/Post/PViewDataGModelIO.cpp gmsh-4.2.2-source-new/Post/PViewDataGModelIO.cpp +--- gmsh-4.2.2-source/Post/PViewDataGModelIO.cpp 2019-03-08 11:12:04.000000000 +0100 ++++ gmsh-4.2.2-source-new/Post/PViewDataGModelIO.cpp 2019-03-13 14:11:41.712474802 +0100 +@@ -469,7 +469,7 @@ void PViewDataGModel::importLists(int N[ + #if defined(HAVE_MED) - extern "C" { -#include +#include - } #if(MED_MAJOR_NUM >= 3) + // To avoid too many ifdefs below we use defines for the bits of the diff --git a/gmsh_python.patch b/gmsh_python.patch index ab74071..6af002e 100644 --- a/gmsh_python.patch +++ b/gmsh_python.patch @@ -1,7 +1,7 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-07 21:27:55.169343301 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:55.340327226 +0100 -@@ -1815,6 +1815,8 @@ else() +diff -rupN gmsh-4.2.2-source/CMakeLists.txt gmsh-4.2.2-source-new/CMakeLists.txt +--- gmsh-4.2.2-source/CMakeLists.txt 2019-03-08 19:26:18.000000000 +0100 ++++ gmsh-4.2.2-source-new/CMakeLists.txt 2019-03-13 13:46:51.958374062 +0100 +@@ -1801,6 +1801,8 @@ else() set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR}) endif() @@ -10,7 +10,7 @@ diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt # FIXME: change this once we understand rpaths if(APPLE) if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) -@@ -1836,11 +1838,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D +@@ -1822,11 +1824,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D endif() if(ENABLE_ONELAB) @@ -24,9 +24,9 @@ diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.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.2.1-source/Common/GmshMessage.cpp gmsh-4.2.1-source-new/Common/GmshMessage.cpp ---- gmsh-4.2.1-source/Common/GmshMessage.cpp 2019-02-27 14:00:46.000000000 +0100 -+++ gmsh-4.2.1-source-new/Common/GmshMessage.cpp 2019-03-07 21:27:55.340327226 +0100 +diff -rupN gmsh-4.2.2-source/Common/GmshMessage.cpp gmsh-4.2.2-source-new/Common/GmshMessage.cpp +--- gmsh-4.2.2-source/Common/GmshMessage.cpp 2019-02-27 14:00:46.000000000 +0100 ++++ gmsh-4.2.2-source-new/Common/GmshMessage.cpp 2019-03-13 13:46:51.958374062 +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 deleted file mode 100644 index 9dd2b59..0000000 --- a/gmsh_unbundle.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -rupN gmsh-4.2.1-source/CMakeLists.txt gmsh-4.2.1-source-new/CMakeLists.txt ---- gmsh-4.2.1-source/CMakeLists.txt 2019-03-06 18:01:54.000000000 +0100 -+++ gmsh-4.2.1-source-new/CMakeLists.txt 2019-03-07 21:27:55.038355616 +0100 -@@ -132,7 +132,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 -- contrib/MeshQualityOptimizer/*.h contrib/MathEx/*.h) -+ contrib/MeshQualityOptimizer/*.h) - 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) -@@ -722,7 +722,7 @@ if(HAVE_FLTK OR ENABLE_GRAPHICS) - endif() - - if(ENABLE_ANN) -- find_library(ANN_LIB ann PATH_SUFFIXES lib) -+ find_library(ANN_LIB ANN PATH_SUFFIXES lib) - 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") -@@ -736,9 +736,17 @@ if(ENABLE_ANN) - endif() - endif() - --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) -+ list(APPEND EXTERNAL_LIBRARIES ${BFGS_LIB} -lalglib) -+ list(APPEND EXTERNAL_INCLUDES ${BFGS_INC}) -+ else(BFGS_LIB AND BFGS_INC) -+ message(STATUS "System libbfgs not found: using contrib/lbfgs instead") -+ add_subdirectory(contrib/lbfgs) -+ include_directories(contrib/lbfgs) -+ endif(BFGS_LIB AND BFGS_INC) - set_config_option(HAVE_BFGS "Bfgs") - endif() - -@@ -804,9 +812,17 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/co - endif() - endif() - --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) -+ list(APPEND EXTERNAL_LIBRARIES ${MATHEX_LIB}) -+ list(APPEND EXTERNAL_INCLUDES ${MATHEX_INC}) -+ else(MATHEX_LIB AND MATHEX_INC) -+ message(STATUS "System MATHEX not found: using contrib/MathEx instead") -+ add_subdirectory(contrib/MathEx) -+ include_directories(contrib/MathEx) -+ endif(MATHEX_LIB AND MATHEX_INC) - set_config_option(HAVE_MATHEX "MathEx") - endif() - -@@ -880,10 +896,23 @@ if(HAVE_MESH) - set_config_option(HAVE_BLOSSOM "Blossom") - endif() - -- 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) -+ list(APPEND EXTERNAL_LIBRARIES ${NETGEN_LIB}) -+ list(APPEND EXTERNAL_INCLUDES ${NETGEN_INC}) -+ # Netgen private headers contain what contrib/Salome does -+ list(APPEND EXTERNAL_LIBRARIES -lngocc -lngcsg -lngmesh -lnginterface) -+ list(APPEND EXTERNAL_INCLUDES ${NETGEN_INC}/private ${NETGEN_INC} ${NETGEN_INC}/private/include) -+ add_definitions(-DOCCGEOMETRY) -+ set_config_option(HAVE_SALOME "Salome") -+ else(NETGEN_LIB AND NETGEN_INC) -+ message(STATUS "System netgen not found: using contrib/Netgen instead") -+ add_subdirectory(contrib/Netgen) -+ include_directories(contrib/Netgen contrib/Netgen/libsrc/include -+ contrib/Netgen/nglib) -+ endif(NETGEN_LIB AND NETGEN_INC) - set_config_option(HAVE_NETGEN "Netgen") - add_definitions(-DNO_PARALLEL_THREADS -DNOTCL) - endif() -@@ -895,7 +924,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.2.1-source/Mesh/CMakeLists.txt gmsh-4.2.1-source-new/Mesh/CMakeLists.txt ---- gmsh-4.2.1-source/Mesh/CMakeLists.txt 2019-02-04 10:35:32.000000000 +0100 -+++ gmsh-4.2.1-source-new/Mesh/CMakeLists.txt 2019-03-07 21:27:55.038355616 +0100 -@@ -31,6 +31,7 @@ set(SRC - DivideAndConquer.cpp - Field.cpp - filterElements.cpp -+ nglib_gmsh.cpp - ) - - file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) diff --git a/sources b/sources index d6b28ea..b470553 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gmsh-4.2.1-source-fedora.tar.xz) = 3bb0a09913ef240f74cc8ca3a97754c06ff261db4c3168a09881c1a80ffb367b1bb76d67864e21e9a928a061ab8b44c39c03e5bb0d6e80c0e91b484023a0a493 +SHA512 (gmsh-4.2.2-source-fedora.tar.xz) = 4d367d0fc994b8e1a5d7164d56bdc99ae1f1a624222de3b9efb994948ca5551111dc089f137d47410f900fbdcea0cfd866411e7fafab1217d030eb6d5cc351eb