From 2543855db2e86217bcad6387956b5d1bcce424f3 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Jul 13 2020 18:19:46 +0000
Subject: Update to 4.6.0


---

diff --git a/.gitignore b/.gitignore
index 06a39db..4994595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /gmsh-4.5.4-source-fedora.tar.xz
 /gmsh-4.5.5-source-fedora.tar.xz
 /gmsh-4.5.6-source-fedora.tar.xz
+/gmsh-4.6.0-source-fedora.tar.xz
diff --git a/gmsh.spec b/gmsh.spec
index 5c88884..7982327 100644
--- a/gmsh.spec
+++ b/gmsh.spec
@@ -3,8 +3,8 @@
 
 Name:       gmsh
 Summary:    A three-dimensional finite element mesh generator
-Version:    4.5.6
-Release:    4%{?dist}
+Version:    4.6.0
+Release:    1%{?dist}
 
 # gmsh is GPLv2+ with exceptions, see LICENSE.txt
 # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt
@@ -51,13 +51,18 @@ BuildRequires: mathex-devel
 BuildRequires: med-devel
 BuildRequires: mesa-libGLU-devel
 BuildRequires: metis-devel
-BuildRequires: mmg3d-devel
 BuildRequires: netgen-mesher-devel-private
 BuildRequires: opencascade-devel
 BuildRequires: python3-devel
 BuildRequires: voro++-devel
 BuildRequires: zlib-devel
 BuildRequires: texinfo
+# For transforming icon
+BuildRequires: ImageMagick
+
+# TODO: Unbundle as soon as gmsh starts bundling a more recent version of mmg3d again
+# BuildRequires: mmg3d-devel
+Provides:      bundled(mmg3d)
 
 Requires:       %{name}-common = %{version}-%{release}
 
@@ -195,6 +200,7 @@ cp contrib/Netgen/nglib_gmsh.h contrib/Netgen/nglib_gmsh.cpp Mesh
 # hxt: see contrib/hxt/CREDITS.txt
 # kbipack: Source not available on the net anymore
 # onelab: gmsh internal module
+# mmg: Currently not unbundleable
 (
 cd contrib;
 ls -1 | \
@@ -206,6 +212,7 @@ ls -1 | \
     grep -v ^hxt$ | \
     grep -v ^kbipack$ | \
     grep -v ^onelab$ | \
+    grep -v ^mmg$ | \
 xargs rm -rf
 )
 
@@ -305,7 +312,8 @@ cp -a Parser/Gmsh.* build-mpich
 find %{buildroot} -type f -name libgmsh.a -exec rm -f {} \;
 
 # Install icon and .desktop file
-install -Dpm 0644 utils/icons/solid_128x128.png  %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+convert -scale 128 utils/icons/gmsh.png icon_128x128.png
+install -Dpm 0644 icon_128x128.png  %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 # Install License.txt via %%license
@@ -341,7 +349,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files libs
 %license LICENSE.txt
-%{_libdir}/libgmsh.so.4.5*
+%{_libdir}/libgmsh.so.4.6*
 
 %files -n python3-%{name}
 %{python3_sitelib}/gmsh.py
@@ -359,7 +367,7 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files openmpi-libs
 %license LICENSE.txt
-%{_libdir}/openmpi/lib/libgmsh.so.4.5*
+%{_libdir}/openmpi/lib/libgmsh.so.4.6*
 %endif
 
 %if %{with mpich}
@@ -374,11 +382,14 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt
 
 %files mpich-libs
 %license LICENSE.txt
-%{_libdir}/mpich/lib/libgmsh.so.4.5*
+%{_libdir}/mpich/lib/libgmsh.so.4.6*
 %endif
 
 
 %changelog
+* Mon Jul 13 2020 Sandro Mani <manisandro@gmail.com> - 4.6.0-1
+- Update to 4.6.0
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.5.6-4
 - Rebuilt for Python 3.9
 
diff --git a/gmsh_build.patch b/gmsh_build.patch
index 12a56b5..10e8140 100644
--- a/gmsh_build.patch
+++ b/gmsh_build.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-source-new/Fltk/helpWindow.cpp
---- gmsh-4.5.6-source/Fltk/helpWindow.cpp	2020-04-06 23:51:16.379659060 +0200
-+++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp	2020-04-06 23:51:16.642659616 +0200
+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
 @@ -3,6 +3,12 @@
  // See the LICENSE.txt file for license information. Please report all
  // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
diff --git a/gmsh_c++14.patch b/gmsh_c++14.patch
index 4cb2a92..70e2f9b 100644
--- a/gmsh_c++14.patch
+++ b/gmsh_c++14.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt
---- gmsh-4.5.6-source/CMakeLists.txt	2020-04-06 23:51:16.106658483 +0200
-+++ gmsh-4.5.6-source-new/CMakeLists.txt	2020-04-06 23:51:16.108658487 +0200
-@@ -44,7 +44,7 @@ opt(BUILD_IOS "Enable iOS library target
+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})
@@ -10,7 +10,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-n
  opt(C99 "Enable C99" ON)
  opt(PROFILE "Enable profiling compiler flags" OFF)
  opt(DINTEGRATION "Enable discrete integration (needed for levelsets)" ${DEFAULT})
-@@ -325,13 +325,13 @@ if(ENABLE_OPENACC)
+@@ -337,13 +337,13 @@ if(ENABLE_OPENACC)
    endif()
  endif()
  
@@ -31,7 +31,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-n
  
  if(ENABLE_C99)
    # in recent cmake versions we could do e.g. set(CMAKE_C_STANDARD 99)
-@@ -1536,10 +1536,10 @@ if(ENABLE_REVOROPT)
+@@ -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
@@ -44,7 +44,7 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-n
      endif()
    else()
      message(WARNING "Revoropt requires Eigen3, Mesh, Plugins, ANN and ALGLIB")
-@@ -1722,7 +1722,7 @@ if(ENABLE_BUILD_ANDROID)
+@@ -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)
diff --git a/gmsh_install.patch b/gmsh_install.patch
index a746a5f..2cd1be1 100644
--- a/gmsh_install.patch
+++ b/gmsh_install.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt
---- gmsh-4.5.6-source/CMakeLists.txt	2020-04-06 23:51:16.513659344 +0200
-+++ gmsh-4.5.6-source-new/CMakeLists.txt	2020-04-06 23:51:16.516659350 +0200
-@@ -253,7 +253,7 @@ else()
+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)
    # 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 fa7aa12..e19a8ec 100644
--- a/gmsh_julia.patch
+++ b/gmsh_julia.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt
---- gmsh-4.5.6-source/CMakeLists.txt	2020-04-06 23:51:16.248658783 +0200
-+++ gmsh-4.5.6-source-new/CMakeLists.txt	2020-04-06 23:51:16.381659064 +0200
-@@ -1883,7 +1883,7 @@ endif()
+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()
  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 1c726ff..2632b82 100644
--- a/gmsh_med.patch
+++ b/gmsh_med.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/Common/CommandLine.cpp gmsh-4.5.6-source-new/Common/CommandLine.cpp
---- gmsh-4.5.6-source/Common/CommandLine.cpp	2020-03-30 16:09:59.000000000 +0200
-+++ gmsh-4.5.6-source-new/Common/CommandLine.cpp	2020-04-06 23:51:16.250658787 +0200
+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
 @@ -42,7 +42,7 @@
  #endif
  
@@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Common/CommandLine.cpp gmsh-4.5.6-
  #endif
  
  #if defined(HAVE_POST)
-diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-source-new/Fltk/helpWindow.cpp
---- gmsh-4.5.6-source/Fltk/helpWindow.cpp	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.5.6-source-new/Fltk/helpWindow.cpp	2020-04-06 23:51:16.251658790 +0200
+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 @@
  #endif
  
@@ -22,9 +22,9 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Fltk/helpWindow.cpp gmsh-4.5.6-sou
  #endif
  
  static const char *help_link(Fl_Widget *w, const char *uri)
-diff -rupN --no-dereference gmsh-4.5.6-source/Geo/GModelIO_MED.cpp gmsh-4.5.6-source-new/Geo/GModelIO_MED.cpp
---- gmsh-4.5.6-source/Geo/GModelIO_MED.cpp	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.5.6-source-new/Geo/GModelIO_MED.cpp	2020-04-06 23:51:16.251658790 +0200
+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
 @@ -26,7 +26,7 @@
  #include "discreteVertex.h"
  #include "Context.h"
@@ -34,10 +34,10 @@ diff -rupN --no-dereference gmsh-4.5.6-source/Geo/GModelIO_MED.cpp gmsh-4.5.6-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.5.6-source/Post/PViewDataGModelIO.cpp gmsh-4.5.6-source-new/Post/PViewDataGModelIO.cpp
---- gmsh-4.5.6-source/Post/PViewDataGModelIO.cpp	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.5.6-source-new/Post/PViewDataGModelIO.cpp	2020-04-06 23:51:16.251658790 +0200
-@@ -471,7 +471,7 @@ void PViewDataGModel::importLists(int N[
+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[
  
  #if defined(HAVE_MED)
  
diff --git a/gmsh_python.patch b/gmsh_python.patch
index dfbea11..1eb8007 100644
--- a/gmsh_python.patch
+++ b/gmsh_python.patch
@@ -1,16 +1,16 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt
---- gmsh-4.5.6-source/CMakeLists.txt	2020-03-30 16:09:59.000000000 +0200
-+++ gmsh-4.5.6-source-new/CMakeLists.txt	2020-04-06 23:51:15.965658185 +0200
-@@ -1857,6 +1857,8 @@ else()
+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()
    set(GMSH_INC ${CMAKE_INSTALL_INCLUDEDIR})
  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)
-@@ -1876,11 +1878,11 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+ # 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
  endif()
  
  if(ENABLE_ONELAB)
@@ -24,10 +24,10 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-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.5.6-source/Common/GmshMessage.cpp gmsh-4.5.6-source-new/Common/GmshMessage.cpp
---- gmsh-4.5.6-source/Common/GmshMessage.cpp	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.5.6-source-new/Common/GmshMessage.cpp	2020-04-06 23:51:15.966658187 +0200
-@@ -158,12 +158,6 @@ void Msg::Init(int argc, char **argv)
+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];
  
diff --git a/gmsh_unbundle_gl2ps.patch b/gmsh_unbundle_gl2ps.patch
index 4d447ac..205213f 100644
--- a/gmsh_unbundle_gl2ps.patch
+++ b/gmsh_unbundle_gl2ps.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-new/CMakeLists.txt
---- gmsh-4.5.6-source/CMakeLists.txt	2020-04-06 23:51:16.640659612 +0200
-+++ gmsh-4.5.6-source-new/CMakeLists.txt	2020-04-06 23:51:16.777659902 +0200
-@@ -1615,6 +1615,8 @@ if(NOT ENABLE_BUILD_DYNAMIC AND NOT ENAB
+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
    endif()
  endif()
  
@@ -10,9 +10,9 @@ diff -rupN --no-dereference gmsh-4.5.6-source/CMakeLists.txt gmsh-4.5.6-source-n
  # Linux-specific linking
  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    if(HAVE_OCC)
-diff -rupN --no-dereference gmsh-4.5.6-source/Graphics/CMakeLists.txt gmsh-4.5.6-source-new/Graphics/CMakeLists.txt
---- gmsh-4.5.6-source/Graphics/CMakeLists.txt	2020-03-28 12:28:04.000000000 +0100
-+++ gmsh-4.5.6-source-new/Graphics/CMakeLists.txt	2020-04-06 23:51:16.777659902 +0200
+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
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
diff --git a/sources b/sources
index a9a3016..28d3122 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gmsh-4.5.6-source-fedora.tar.xz) = 282cd0f07310ad1be7fffc3ce84b3a5880138bb784fdb4fcf770c6033c8197d16fe2c799d54b80dec5189b49f2805b5851249ef6d5e1cea660c6f8c34f85997b
+SHA512 (gmsh-4.6.0-source-fedora.tar.xz) = e8adf00760a2e93548c937a60130615f7a4195a8c5d6e2d1b9c52383900bc56a8ddabcfda52761d52248c9c49aa6881f71edd87fcda37fe0f017628702329352