From e28eba6449b4fd80cff6f5f61783a6a7c66c24d7 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Nov 08 2020 18:05:38 +0000
Subject: Update to 4.7.0.


---

diff --git a/.gitignore b/.gitignore
index 4994595..dd5c9ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@
 /gmsh-4.5.5-source-fedora.tar.xz
 /gmsh-4.5.6-source-fedora.tar.xz
 /gmsh-4.6.0-source-fedora.tar.xz
+/gmsh-4.7.0-source-fedora.tar.xz
diff --git a/gmsh.spec b/gmsh.spec
index 102257c..ad437db 100644
--- a/gmsh.spec
+++ b/gmsh.spec
@@ -1,14 +1,16 @@
 %bcond_without openmpi
 %bcond_without mpich
 
+%global sover 4.7
+
 %if 0%{?fedora} >= 33
 %bcond_without flexiblas
 %endif
 
 Name:       gmsh
 Summary:    A three-dimensional finite element mesh generator
-Version:    4.6.0
-Release:    5%{?dist}
+Version:    4.7.0
+Release:    1%{?dist}
 
 # gmsh is GPLv2+ with exceptions, see LICENSE.txt
 # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt
@@ -41,6 +43,7 @@ BuildRequires:  flexiblas-devel
 %else
 BuildRequires:  blas-devel, lapack-devel
 %endif
+BuildRequires:  eigen3-devel
 BuildRequires: cgnslib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -238,6 +241,7 @@ done
 
 gmsh_cmake_args="\
     %{?with_flexiblas:-DBLAS_LIBRARIES=-lflexiblas} \
+	-DCMAKE_CXX_STANDARD=14 \
     -DENABLE_SYSTEM_CONTRIB=YES \
     -DENABLE_BUILD_LIB=YES \
     -DENABLE_BUILD_SHARED=YES \
@@ -247,6 +251,8 @@ gmsh_cmake_args="\
     -DENABLE_BLOSSOM=NO \
     -DENABLE_CGNS=YES \
     -DENABLE_MED=YES \
+    -DENABLE_EIGEN=YES \
+    -DEIGEN_INC=%{_includedir}/eigen3 \
     -DENABLE_OCC=YES"
 
 ### serial version ###
@@ -358,7 +364,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files libs
 %license LICENSE.txt
-%{_libdir}/libgmsh.so.4.6*
+%{_libdir}/libgmsh.so.%{sover}*
 
 %files -n python3-%{name}
 %{python3_sitelib}/gmsh.py
@@ -376,7 +382,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files openmpi-libs
 %license LICENSE.txt
-%{_libdir}/openmpi/lib/libgmsh.so.4.6*
+%{_libdir}/openmpi/lib/libgmsh.so.%{sover}*
 %endif
 
 %if %{with mpich}
@@ -391,11 +397,14 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files mpich-libs
 %license LICENSE.txt
-%{_libdir}/mpich/lib/libgmsh.so.4.6*
+%{_libdir}/mpich/lib/libgmsh.so.%{sover}*
 %endif
 
 
 %changelog
+* Sun Nov 08 2020 Richard Shaw <hobbes1069@gmail.com> - 4.7.0-1
+- Update to 4.7.0.
+
 * Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 4.6.0-5
 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
 
diff --git a/gmsh_build.patch b/gmsh_build.patch
index 10e8140..bdfba79 100644
--- a/gmsh_build.patch
+++ b/gmsh_build.patch
@@ -1,6 +1,7 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/Fltk/helpWindow.cpp gmsh-4.6.0-source-new/Fltk/helpWindow.cpp
---- gmsh-4.6.0-source/Fltk/helpWindow.cpp	2020-06-23 09:36:32.877202577 +0200
-+++ gmsh-4.6.0-source-new/Fltk/helpWindow.cpp	2020-06-23 09:36:33.166201093 +0200
+Index: gmsh-4.7.0-source/Fltk/helpWindow.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Fltk/helpWindow.cpp
++++ gmsh-4.7.0-source/Fltk/helpWindow.cpp
 @@ -3,6 +3,12 @@
  // See the LICENSE.txt file for license information. Please report all
  // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
@@ -14,7 +15,7 @@ diff -rupN --no-dereference gmsh-4.6.0-source/Fltk/helpWindow.cpp gmsh-4.6.0-sou
  #include <sstream>
  #include <algorithm>
  #include <string>
-@@ -13,7 +19,6 @@
+@@ -11,7 +17,6 @@
  #include <FL/Fl_Check_Button.H>
  #include <FL/Fl_Input.H>
  #include <FL/Fl_Color_Chooser.H>
diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch
index 70e2f9b..93213b9 100644
--- a/gmsh_c++14.patch
+++ b/gmsh_c++14.patch
@@ -1,55 +1,13 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-new/CMakeLists.txt
---- gmsh-4.6.0-source/CMakeLists.txt	2020-06-23 09:36:32.599204009 +0200
-+++ gmsh-4.6.0-source-new/CMakeLists.txt	2020-06-23 09:36:32.602203993 +0200
-@@ -43,7 +43,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})
-@@ -337,13 +337,13 @@ if(ENABLE_OPENACC)
-   endif()
- endif()
+Index: gmsh-4.7.0-source/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/CMakeLists.txt
++++ gmsh-4.7.0-source/CMakeLists.txt
+@@ -17,7 +17,7 @@ endif()
+ project(gmsh CXX C)
  
--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()
--endif()
-+if(ENABLE_CXX14)
-+  check_cxx_compiler_flag("-std=c++14" STDCXX14)
-+  if(STDCXX14)
-+    set_config_option(HAVE_CXX14 "C++14")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-+  endif(STDCXX14)
-+endif(ENABLE_CXX14)
+ # require C++11 and request C99
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_C_STANDARD 99)
  
- if(ENABLE_C99)
-   # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99)
-@@ -1524,10 +1524,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()
-       set_source_files_properties(Plugin/CVTRemesh.cpp PROPERTIES
--                                  COMPILE_FLAGS "-std=c++11")
-+                                  COMPILE_FLAGS "-std=c++14")
-     endif()
-   else()
-     message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, ANN and ALGLIB")
-@@ -1719,7 +1719,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)
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-   set(CMAKE_BUILD_TYPE Release)
-   set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_CURRENT_BINARY_DIR})
-   set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/libs/)
diff --git a/gmsh_install.patch b/gmsh_install.patch
index 2cd1be1..97b3942 100644
--- a/gmsh_install.patch
+++ b/gmsh_install.patch
@@ -1,7 +1,8 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-new/CMakeLists.txt
---- gmsh-4.6.0-source/CMakeLists.txt	2020-06-23 09:36:33.018201852 +0200
-+++ gmsh-4.6.0-source-new/CMakeLists.txt	2020-06-23 09:36:33.020201841 +0200
-@@ -257,7 +257,7 @@ if(ENABLE_RPATH)
+Index: gmsh-4.7.0-source/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/CMakeLists.txt
++++ gmsh-4.7.0-source/CMakeLists.txt
+@@ -262,7 +262,7 @@ if(ENABLE_RPATH)
    # when building, don't use the install RPATH already (but later on when
    # installing)
    set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
diff --git a/gmsh_julia.patch b/gmsh_julia.patch
index e19a8ec..483e92d 100644
--- a/gmsh_julia.patch
+++ b/gmsh_julia.patch
@@ -1,7 +1,8 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-new/CMakeLists.txt
---- gmsh-4.6.0-source/CMakeLists.txt	2020-06-23 09:36:32.743203267 +0200
-+++ gmsh-4.6.0-source-new/CMakeLists.txt	2020-06-23 09:36:32.879202567 +0200
-@@ -1872,7 +1872,7 @@ endif()
+Index: gmsh-4.7.0-source/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/CMakeLists.txt
++++ gmsh-4.7.0-source/CMakeLists.txt
+@@ -1889,7 +1889,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 2632b82..dfc6ba9 100644
--- a/gmsh_med.patch
+++ b/gmsh_med.patch
@@ -1,6 +1,7 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/Common/CommandLine.cpp gmsh-4.6.0-source-new/Common/CommandLine.cpp
---- gmsh-4.6.0-source/Common/CommandLine.cpp	2020-06-15 16:04:51.000000000 +0200
-+++ gmsh-4.6.0-source-new/Common/CommandLine.cpp	2020-06-23 09:36:32.745203257 +0200
+Index: gmsh-4.7.0-source/Common/CommandLine.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Common/CommandLine.cpp
++++ gmsh-4.7.0-source/Common/CommandLine.cpp
 @@ -42,7 +42,7 @@
  #endif
  
@@ -10,10 +11,11 @@ diff -rupN --no-dereference gmsh-4.6.0-source/Common/CommandLine.cpp gmsh-4.6.0-
  #endif
  
  #if defined(HAVE_POST)
-diff -rupN --no-dereference gmsh-4.6.0-source/Fltk/helpWindow.cpp gmsh-4.6.0-source-new/Fltk/helpWindow.cpp
---- gmsh-4.6.0-source/Fltk/helpWindow.cpp	2020-06-15 16:04:51.000000000 +0200
-+++ gmsh-4.6.0-source-new/Fltk/helpWindow.cpp	2020-06-23 09:36:32.746203252 +0200
-@@ -38,7 +38,7 @@
+Index: gmsh-4.7.0-source/Fltk/helpWindow.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Fltk/helpWindow.cpp
++++ gmsh-4.7.0-source/Fltk/helpWindow.cpp
+@@ -36,7 +36,7 @@
  #endif
  
  #if defined(HAVE_MED)
@@ -22,9 +24,10 @@ diff -rupN --no-dereference gmsh-4.6.0-source/Fltk/helpWindow.cpp gmsh-4.6.0-sou
  #endif
  
  static const char *help_link(Fl_Widget *w, const char *uri)
-diff -rupN --no-dereference gmsh-4.6.0-source/Geo/GModelIO_MED.cpp gmsh-4.6.0-source-new/Geo/GModelIO_MED.cpp
---- gmsh-4.6.0-source/Geo/GModelIO_MED.cpp	2020-06-05 11:56:04.000000000 +0200
-+++ gmsh-4.6.0-source-new/Geo/GModelIO_MED.cpp	2020-06-23 09:36:32.746203252 +0200
+Index: gmsh-4.7.0-source/Geo/GModelIO_MED.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Geo/GModelIO_MED.cpp
++++ gmsh-4.7.0-source/Geo/GModelIO_MED.cpp
 @@ -26,7 +26,7 @@
  #include "discreteVertex.h"
  #include "Context.h"
@@ -34,10 +37,11 @@ diff -rupN --no-dereference gmsh-4.6.0-source/Geo/GModelIO_MED.cpp gmsh-4.6.0-so
  
  #if(MED_MAJOR_NUM >= 3)
  // To avoid too many ifdefs below we use defines for the bits of the
-diff -rupN --no-dereference gmsh-4.6.0-source/Post/PViewDataGModelIO.cpp gmsh-4.6.0-source-new/Post/PViewDataGModelIO.cpp
---- gmsh-4.6.0-source/Post/PViewDataGModelIO.cpp	2020-06-05 11:56:06.000000000 +0200
-+++ gmsh-4.6.0-source-new/Post/PViewDataGModelIO.cpp	2020-06-23 09:36:32.746203252 +0200
-@@ -515,7 +515,7 @@ void PViewDataGModel::importLists(int N[
+Index: gmsh-4.7.0-source/Post/PViewDataGModelIO.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Post/PViewDataGModelIO.cpp
++++ gmsh-4.7.0-source/Post/PViewDataGModelIO.cpp
+@@ -530,7 +530,7 @@ void PViewDataGModel::importLists(int N[
  
  #if defined(HAVE_MED)
  
diff --git a/gmsh_python.patch b/gmsh_python.patch
index 1eb8007..94bd2eb 100644
--- a/gmsh_python.patch
+++ b/gmsh_python.patch
@@ -1,7 +1,8 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-new/CMakeLists.txt
---- gmsh-4.6.0-source/CMakeLists.txt	2020-06-18 16:15:50.000000000 +0200
-+++ gmsh-4.6.0-source-new/CMakeLists.txt	2020-06-23 09:36:32.464204704 +0200
-@@ -1854,6 +1854,8 @@ else()
+Index: gmsh-4.7.0-source/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/CMakeLists.txt
++++ gmsh-4.7.0-source/CMakeLists.txt
+@@ -1871,6 +1871,8 @@ else()
    set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR})
  endif()
  
@@ -10,7 +11,7 @@ diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-n
  # mark targets as optional so we can install them separately if needed
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
-@@ -1865,11 +1867,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1882,11 +1884,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
  endif()
  
  if(ENABLE_ONELAB)
@@ -24,12 +25,13 @@ diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-n
    install(FILES ${GMSH_JL} DESTINATION ${GMSH_LIB})
    if(ENABLE_PRIVATE_API)
      install(FILES ${GMSH_PRIVATE_API} DESTINATION ${GMSH_INC}/gmsh)
-diff -rupN --no-dereference gmsh-4.6.0-source/Common/GmshMessage.cpp gmsh-4.6.0-source-new/Common/GmshMessage.cpp
---- gmsh-4.6.0-source/Common/GmshMessage.cpp	2020-06-12 19:38:49.000000000 +0200
-+++ gmsh-4.6.0-source-new/Common/GmshMessage.cpp	2020-06-23 09:36:32.464204704 +0200
-@@ -159,12 +159,6 @@ void Msg::Init(int argc, char **argv)
-   if(CTX::instance()->exeFileName.empty() && argc && argv)
-     CTX::instance()->exeFileName = argv[0];
+Index: gmsh-4.7.0-source/Common/GmshMessage.cpp
+===================================================================
+--- gmsh-4.7.0-source.orig/Common/GmshMessage.cpp
++++ gmsh-4.7.0-source/Common/GmshMessage.cpp
+@@ -161,12 +161,6 @@ void Msg::Init(int argc, char **argv)
+   if(CTX::instance()->exeFileName.empty() && _commandLineArgs.size())
+     CTX::instance()->exeFileName = _commandLineArgs[0];
  
 -  // add the directory where the binary is installed to the path where Python
 -  // looks for modules, and to the path for executables (this allows us to find
@@ -37,6 +39,6 @@ diff -rupN --no-dereference gmsh-4.6.0-source/Common/GmshMessage.cpp gmsh-4.6.0-
 -  addGmshPathToEnvironmentVar("PYTHONPATH");
 -  addGmshPathToEnvironmentVar("PATH");
 -
-   InitializeOnelab("Gmsh");
- }
- 
+   // make sure to use the "C" locale; in particular this ensures that we will
+   // use a dot for for the decimal separator when writing ASCII mesh files
+   std::setlocale(LC_ALL, "C.UTF-8");
diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch
index 205213f..36bf658 100644
--- a/gmsh_unbundle_gl2ps.patch
+++ b/gmsh_unbundle_gl2ps.patch
@@ -1,18 +1,20 @@
-diff -rupN --no-dereference gmsh-4.6.0-source/CMakeLists.txt gmsh-4.6.0-source-new/CMakeLists.txt
---- gmsh-4.6.0-source/CMakeLists.txt	2020-06-23 09:36:33.165201099 +0200
-+++ gmsh-4.6.0-source-new/CMakeLists.txt	2020-06-23 09:36:33.301200402 +0200
-@@ -1607,6 +1607,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB
+Index: gmsh-4.7.0-source/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/CMakeLists.txt
++++ gmsh-4.7.0-source/CMakeLists.txt
+@@ -1620,6 +1620,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB
    endif()
  endif()
  
 +list(APPEND LINK_LIBRARIES -lgl2ps -lGL)
 +
- # Linux-specific linking
+ # Linux-specific linker options
  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    if(HAVE_OCC)
-diff -rupN --no-dereference gmsh-4.6.0-source/Graphics/CMakeLists.txt gmsh-4.6.0-source-new/Graphics/CMakeLists.txt
---- gmsh-4.6.0-source/Graphics/CMakeLists.txt	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.6.0-source-new/Graphics/CMakeLists.txt	2020-06-23 09:36:33.301200402 +0200
+Index: gmsh-4.7.0-source/Graphics/CMakeLists.txt
+===================================================================
+--- gmsh-4.7.0-source.orig/Graphics/CMakeLists.txt
++++ gmsh-4.7.0-source/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
diff --git a/sources b/sources
index 28d3122..be48678 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gmsh-4.6.0-source-fedora.tar.xz) = e8adf00760a2e93548c937a60130615f7a4195a8c5d6e2d1b9c52383900bc56a8ddabcfda52761d52248c9c49aa6881f71edd87fcda37fe0f017628702329352
+SHA512 (gmsh-4.7.0-source-fedora.tar.xz) = bc302436d0ed6fdc4f59b701164d4fc37bd1491bf68d8dd2cade11404bff69962568fdd0e7b83a16818f14fd6b337404dd9a3178f168b4f94f476a9be926669f