<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/27c5047377cbbd41827637c940a91cd1b6197612">https://github.com/macports/macports-ports/commit/27c5047377cbbd41827637c940a91cd1b6197612</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 27c5047377c openmotif: fix build
</span>27c5047377c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 27c5047377cbbd41827637c940a91cd1b6197612
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue May 14 17:25:50 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> openmotif: fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid duplicating a symbol in libXt
</span>---
x11/openmotif/Portfile | 49 +++++++++++++++-------------
x11/openmotif/files/patch-lib-xm-vendor.diff | 14 ++++++++
2 files changed, 41 insertions(+), 22 deletions(-)
<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 a2c1d77c54c..e810c91cb2d 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;'>@@ -1,11 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name openmotif
version 2.3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories x11
license LGPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description The Open Motif toolkit for X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,43 +14,47 @@ long_description \
</span> This is The Open Group's full version of the Motif user interface \
component toolkit based on the original OSF sources.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://motif.ics.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://motif.ics.com/
</span> master_sites sourceforge:project/motif/Motif%20${version}%20Source%20Code
distname motif-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7572140bb52ba21ec2f0c85b2605e2b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 ca9d8d67544434c5883d8d0fb684a48f8b0108bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a4c10db68d880d3096c97cc1c995351616a90a57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a4c10db68d880d3096c97cc1c995351616a90a57 \
</span> sha256 859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7 \
size 5704328
depends_build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xbitmaps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xbitmaps \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex
</span>
depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:Xft2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles wcs-functions.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append include-stdlib.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles wcs-functions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include-stdlib.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lib-xm-vendor.diff
</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;background:#e0ffe0;'>+# error: incompatible function pointer types passing 'void (char *)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to parameter of type 'void (*)(String) __attribute__((noreturn))'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# XtSetErrorHandler (WmXtErrorHandler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Wno-error=incompatible-function-pointer-types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-xft \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-jpeg \
</span> --enable-png \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-lib-xm-vendor.diff b/x11/openmotif/files/patch-lib-xm-vendor.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aa952a5d12d
</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/patch-lib-xm-vendor.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This symbol is already defined in Xt. This change matches the code in Athena.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Xm/VendorS.c.orig 2017-08-31 07:12:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Xm/VendorS.c 2024-05-14 17:03:27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,8 +529,10 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ externaldef(vendorshellwidgetclass) WidgetClass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vendorShellWidgetClass = (WidgetClass) (&vendorShellClassRec);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>