<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c0c2fc7124cd89d256e735c1c52714b654a2f33">https://github.com/macports/macports-ports/commit/5c0c2fc7124cd89d256e735c1c52714b654a2f33</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c0c2fc7124cd89d256e735c1c52714b654a2f33
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jan 3 21:54:07 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: update version 4.4.1->4.5.1
</span>---
science/gmsh/Portfile | 18 ++++++++----------
science/gmsh/files/patch-CMakeLists.txt.diff | 23 +++++++++++++++--------
science/gmsh/files/patch-bad_fltk_define.diff | 25 +++++++++++++++++++++++++
3 files changed, 48 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2ef7eb..f359b6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup linear_algebra 1.0
</span> PortGroup muniversal 1.0
name gmsh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,14 @@ master_sites http://gmsh.info/src/
</span> distname gmsh-${version}-source
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e126e2f054acb9321fb68299bbc354f6bccc6ce9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 853c6438fc4e4b765206e66a514b09182c56377bb4b73f1d0d26eda7eb8af0dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13227645
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eddbdd99ff2c995301e14ccd366fa1bccb52b122 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58c7c9fe44704c0b16ad4a437865d12b5dfb68877514358f6c06735cfeed5c66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14781091
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bad_fltk_define.diff
</span>
mpi.setup
veclibfort no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,14 +58,11 @@ depends_lib-append port:alglib \
</span>
# see http://gmsh.info/doc/texinfo/gmsh.html#Compiling-the-source-code
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FLTK native file chooser was never used (not entirely clear why)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/macports/macports-ports/commit/ae18700dfba27d7084104ecfd8c33814008e967b
</span> # install static library
# install shared library
# use shared library for Gmsh executable
# use MacPorts libraries
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DENABLE_NATIVE_FILE_CHOOSER=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_BUILD_LIB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DENABLE_BUILD_LIB=ON \
</span> -DENABLE_BUILD_SHARED=ON \
-DENABLE_BUILD_DYNAMIC=ON \
-DENABLE_SYSTEM_CONTRIB=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-CMakeLists.txt.diff b/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 67a9827..406a409 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> Do not attempt to use MacPorts OpenMP.
Find MacPorts header and library files.
Do not install libraries a second time.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-02-06 05:24:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-02-15 05:23:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,14 +294,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-12-22 03:16:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-01-03 21:46:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,21 +297,6 @@
</span> set_config_option(HAVE_OPENMP "OpenMP")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +15,17 @@ Do not install libraries a second time.
</span> - set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
- list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(APPLE AND EXISTS "/usr/local/lib/libomp.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_config_option(HAVE_OPENMP "OpenMP[usr/local]")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND EXTERNAL_LIBRARIES "-lomp")
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -745,7 +737,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -766,7 +751,7 @@
</span>
if(ENABLE_ALGLIB)
find_library(ALGLIB_LIB alglib PATH_SUFFIXES lib)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +34,7 @@ Do not install libraries a second time.
</span> if(ENABLE_SYSTEM_CONTRIB AND ALGLIB_LIB AND ALGLIB_INC)
list(APPEND EXTERNAL_LIBRARIES ${ALGLIB_LIB})
list(APPEND EXTERNAL_INCLUDES ${ALGLIB_INC})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -894,7 +886,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -914,7 +899,7 @@
</span>
if(ENABLE_VOROPP)
find_library(VOROPP_LIB voro++ PATH_SUFFIXES lib)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +43,7 @@ Do not install libraries a second time.
</span> if(ENABLE_SYSTEM_CONTRIB AND VOROPP_LIB AND VOROPP_INC)
message(STATUS "Using system version of voro++")
list(APPEND EXTERNAL_LIBRARIES ${VOROPP_LIB})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -929,8 +921,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -949,8 +934,8 @@
</span> endif()
if(ENABLE_MMG3D)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +54,7 @@ Do not install libraries a second time.
</span> if(ENABLE_SYSTEM_CONTRIB AND MMG3D_LIB AND MMG3D_INC)
list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1835,8 +1827,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1863,8 +1848,6 @@
</span> endif()
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +64,7 @@ Do not install libraries a second time.
</span>
if(ENABLE_ONELAB)
--- Mesh/meshGRegionMMG3D.cpp.orig 2019-03-14 02:43:47.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mesh/meshGRegionMMG3D.cpp 2019-08-11 10:51:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Mesh/meshGRegionMMG3D.cpp 2020-01-03 21:46:52.000000000 -0700
</span> @@ -19,7 +19,7 @@
#include "Context.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-bad_fltk_define.diff b/science/gmsh/files/patch-bad_fltk_define.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7caf8bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/files/patch-bad_fltk_define.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see https://gitlab.onelab.info/gmsh/gmsh/issues/716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Mesh/gmshCrossFields.cpp.orig 2019-12-20 19:59:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Mesh/gmshCrossFields.cpp 2020-01-04 07:08:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,10 +20,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PView.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PViewDataGModel.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_FLTK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "FlGui.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_OPENMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <omp.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +33,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "linearSystemFull.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "linearSystemPETSc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_FLTK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "FlGui.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline double lifting(double a, double _a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double D = M_PI * .5;
</span></pre><pre style='margin:0'>
</pre>