<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92ed655c50c1114fbabbcc91e3825f2c0f57b63c">https://github.com/macports/macports-ports/commit/92ed655c50c1114fbabbcc91e3825f2c0f57b63c</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 92ed655c50c arb: Avoid redefinition of INFINITY
</span>92ed655c50c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92ed655c50c1114fbabbcc91e3825f2c0f57b63c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 20 01:16:34 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> arb: Avoid redefinition of INFINITY
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61296
</span>---
science/arb/Portfile | 5 ++++-
science/arb/files/patch-ARB-subfams.cpp.diff | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/Portfile b/science/arb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 630f75bc901..27164fdf7e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,12 +59,15 @@ depends_lib port:openmotif \
</span>
pre-patch {
# DOS to UNIX line endings so we can patch.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\r||g" ${worksrcpath}/GDE/MUSCLE/src/globalsosx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|\r||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDE/MUSCLE/src/globalsosx.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDE/MUSCLE/src/subfams.cpp
</span> }
patchfiles patch-ARB-config.makefile.diff \
patch-ARB-globalsosx.cpp.diff \
patch-ARB-intro.fig.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ARB-subfams.cpp.diff \
</span> patch-ARB-arb.diff
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-subfams.cpp.diff b/science/arb/files/patch-ARB-subfams.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6aec0168264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/files/patch-ARB-subfams.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix redefinition of INFINITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.arb-home.de/ticket/830
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.arb-home.de/changeset/18606
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GDE/MUSCLE/src/subfams.cpp.orig (revision 18605)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GDE/MUSCLE/src/subfams.cpp (revision 18606)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,5 +2,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "distfunc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const float INFINITY = float(1e29);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const float FAR_AWAY_DISTANCE = float(1e29); // fixed by arb (old name was: INFINITY; clashed with math.h on OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const unsigned NILL = uInsane;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,5 +44,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 0; i < uNodeCount; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ShortestPathEstimate[i] = INFINITY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ShortestPathEstimate[i] = FAR_AWAY_DISTANCE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Predecessor[i] = NILL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>