<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/1a671cae6888e36dc95718b2d0b80ae239e289de">https://github.com/macports/macports-ports/commit/1a671cae6888e36dc95718b2d0b80ae239e289de</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 1a671cae688 openmotif: Fixes for compilation on macOS11
</span>1a671cae688 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a671cae6888e36dc95718b2d0b80ae239e289de
</span>Author: m-lw <23657661+m-lw@users.noreply.github.com>
AuthorDate: Thu Sep 17 14:43:02 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> openmotif: Fixes for compilation on macOS11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - include stdlib.h for calloc
</span><span style='display:block; white-space:pre;color:#404040;'> - use the system wcs functions, which are available on all modern versions of macOS
</span>---
x11/openmotif/Portfile | 4 ++++
x11/openmotif/files/include-stdlib.patch | 10 ++++++++++
x11/openmotif/files/wcs-functions.patch | 11 +++++++++++
3 files changed, 25 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/Portfile b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52e137c5df5..512ad4f5443 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name openmotif
version 2.3.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11
license LGPL
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +38,9 @@ depends_lib \
</span> port:xorg-libXp \
port:xorg-libXt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles wcs-functions.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append include-stdlib.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # See https://trac.macports.org/ticket/42847
if {[string match "*clang*" ${configure.compiler}]} {
patchfiles-append clang-unsupported-cflags.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/include-stdlib.patch b/x11/openmotif/files/include-stdlib.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..87d66037090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/files/include-stdlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./demos/unsupported/xmform/xmform.c.orig 2016-03-16 02:10:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./demos/unsupported/xmform/xmform.c 2020-09-03 10:45:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmform*bottomShadowColor: black
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ***-------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Xm/Xm.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Xm/Form.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Xm/PushB.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/wcs-functions.patch b/x11/openmotif/files/wcs-functions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb73faca731
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/files/wcs-functions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Xm/TextF.c.orig 2017-08-22 01:27:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Xm/TextF.c 2020-09-03 10:19:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FIX_1409
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined(__FreeBSD__) && (__FreeBSD__ < 4)) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (defined(__NetBSD__) || defined(__OpenBSD__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Modification by Integrated Computer Solutions, Inc. May 2000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span></pre><pre style='margin:0'>
</pre>