<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/bd54759ee22faa4e38c8837af6f8e33b4f7ef8f7">https://github.com/macports/macports-ports/commit/bd54759ee22faa4e38c8837af6f8e33b4f7ef8f7</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 bd54759ee22 arb: Fix build on Lion again
</span>bd54759ee22 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd54759ee22faa4e38c8837af6f8e33b4f7ef8f7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 10 07:01:45 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> arb: Fix build on Lion again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The previous patch is still needed after all, but can safely be applied
</span><span style='display:block; white-space:pre;color:#404040;'> unconditionally.
</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/44368
</span>---
science/arb/Portfile | 6 ++++++
science/arb/files/patch-ARB-globalsosx.cpp.diff | 21 +++++++++++++++++++++
2 files changed, 27 insertions(+)
<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 0548b2b1d80..630f75bc901 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;'>@@ -57,7 +57,13 @@ depends_lib port:openmotif \
</span> port:zlib \
port:coreutils
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DOS to UNIX line endings so we can patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\r||g" ${worksrcpath}/GDE/MUSCLE/src/globalsosx.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-ARB-config.makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ARB-globalsosx.cpp.diff \
</span> patch-ARB-intro.fig.diff \
patch-ARB-arb.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-globalsosx.cpp.diff b/science/arb/files/patch-ARB-globalsosx.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..250dc9c38d9
</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-globalsosx.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure on Mac OS X Lion 10.7:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In file included from src/globalsosx.cpp:16:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/include/mach/task_info.h:252:2: error: unknown type name 'vm_extmod_statistics_data_t'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vm_extmod_statistics_data_t extmod_statistics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1 error generated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GDE/MUSCLE/src/globalsosx.cpp.orig 2016-05-02 06:19:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GDE/MUSCLE/src/globalsosx.cpp 2020-10-10 06:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,10 +13,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/icmp6.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/vmmeter.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/proc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/vm_statistics.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/task_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/task.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach_init.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <mach/vm_statistics.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double DEFAULT_RAM = 1e9;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double DEFAULT_MEM_USE = 1e6;
</span></pre><pre style='margin:0'>
</pre>