<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/ba742a4615af73a868fd125bcab1682ec34f9dad">https://github.com/macports/macports-ports/commit/ba742a4615af73a868fd125bcab1682ec34f9dad</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 ba742a4 gmsh: fix compatibility with cgnslib
</span>ba742a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba742a4615af73a868fd125bcab1682ec34f9dad
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Feb 16 08:18:45 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: fix compatibility with cgnslib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://gitlab.onelab.info/gmsh/gmsh/issues/748
</span>---
science/gmsh/Portfile | 5 ++++-
science/gmsh/files/patch-cgnslib.diff | 27 +++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
<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 590c0da..484ef16 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;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.0
</span>
name gmsh
version 4.5.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,9 @@ compiler.cxx_standard 2011
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://gitlab.onelab.info/gmsh/gmsh/issues/748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cgnslib.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> mpi.setup
veclibfort no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-cgnslib.diff b/science/gmsh/files/patch-cgnslib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..544735a
</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-cgnslib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Geo/CGNSZoneUnstruct.cpp.orig 2020-01-05 02:58:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Geo/CGNSZoneUnstruct.cpp 2020-02-16 07:37:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,17 +128,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(cgnsErr != CG_OK) return cgnsError(__FILE__, __LINE__, fileIndex());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // read connectivity data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::vector<cgsize_t> sectData(dataSize), offsetData(endElt - startElt + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<cgsize_t> sectData(dataSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if CGNS_VERSION == 3400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(sectEltType == MIXED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if CGNS_VERSION >= 3400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<cgsize_t> offsetData(endElt - startElt + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgnsErr = cg_poly_elements_read(fileIndex(), baseIndex(), index(), iSect,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sectData.data(), offsetData.data(), 0);
</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;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cgnsErr = cg_elements_read(fileIndex(), baseIndex(), index(), iSect,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sectData.data(), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cgnsErr = cg_elements_read(fileIndex(), baseIndex(), index(), iSect,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sectData.data(), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(cgnsErr != CG_OK) return cgnsError(__FILE__, __LINE__, fileIndex());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // create elements
</span></pre><pre style='margin:0'>
</pre>