<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/f59e384baa5b925c81bc5cb47c8165d13665b508">https://github.com/macports/macports-ports/commit/f59e384baa5b925c81bc5cb47c8165d13665b508</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f59e384 gmsh: update version 4.5.1->4.5.2
</span>f59e384 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f59e384baa5b925c81bc5cb47c8165d13665b508
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Feb 2 05:58:41 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: update version 4.5.1->4.5.2
</span>---
science/gmsh/Portfile | 13 ++++++-------
science/gmsh/files/patch-CMakeLists.txt.diff | 10 +++++-----
science/gmsh/files/patch-bad_fltk_define.diff | 28 ---------------------------
3 files changed, 11 insertions(+), 40 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 b26790b..590c0da 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.5.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.2
</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,14 +25,13 @@ 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 eddbdd99ff2c995301e14ccd366fa1bccb52b122 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 58c7c9fe44704c0b16ad4a437865d12b5dfb68877514358f6c06735cfeed5c66 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14781091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3bf4b17d4b7eef831782789f951d9143502184bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0120fe240d32ff1d7457f1b6b350cb85c1e01801f9d371a8656c526474882682 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14841960
</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:#ffe0e0;'>- patch-bad_fltk_define.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff
</span>
mpi.setup
veclibfort no
<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 406a409..64a5de1 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;'>@@ -3,7 +3,7 @@ Find MacPorts header and library files.
</span> Do not install libraries a second time.
--- CMakeLists.txt.orig 2019-12-22 03:16:32.000000000 -0700
+++ CMakeLists.txt 2020-01-03 21:46:22.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -297,21 +297,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,21 +298,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;'>@@ -25,7 +25,7 @@ Do not install libraries a second time.
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,7 +751,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,7 +752,7 @@
</span>
if(ENABLE_ALGLIB)
find_library(ALGLIB_LIB alglib PATH_SUFFIXES lib)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,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;'>-@@ -914,7 +899,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -916,7 +901,7 @@
</span>
if(ENABLE_VOROPP)
find_library(VOROPP_LIB voro++ PATH_SUFFIXES lib)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,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;'>-@@ -949,8 +934,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -951,8 +936,8 @@
</span> endif()
if(ENABLE_MMG3D)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,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;'>-@@ -1863,8 +1848,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1865,8 +1850,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;color:#808080;'>diff --git a/science/gmsh/files/patch-bad_fltk_define.diff b/science/gmsh/files/patch-bad_fltk_define.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd2bcfb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/files/patch-bad_fltk_define.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see https://gitlab.onelab.info/gmsh/gmsh/issues/716
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Solver/linearSystemCSR.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Solver/linearSystemCSR.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -436,7 +436,8 @@ void linearSystemCSR<std::complex<double> >::getMatrix(INDEX_TYPE *&jptr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_GMM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "gmm.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BB // can be defined by FlGui.h, and clashes with gmm arg name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <gmm.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <> int linearSystemCSRGmm<double>::systemSolve()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Solver/linearSystemGmm.h b/Solver/linearSystemGmm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6e2e0085..fbca352bb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Solver/linearSystemGmm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Solver/linearSystemGmm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "linearSystem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_GMM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef BB // can be defined by FlGui.h, and clashes with gmm arg name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gmm.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Consider using linearSystemCSRGmm instead: assembly is much faster
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.24.1
</span></pre><pre style='margin:0'>
</pre>