<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/c60fdb09972630414a82f2d349f7cad445c7d088">https://github.com/macports/macports-ports/commit/c60fdb09972630414a82f2d349f7cad445c7d088</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 c60fdb09972 ddd: fix crash on startup
</span>c60fdb09972 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c60fdb09972630414a82f2d349f7cad445c7d088
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue May 14 16:55:31 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> ddd: fix crash on startup
</span>---
devel/ddd/Portfile | 18 ++++++++++++------
devel/ddd/files/patch-fix-crash.diff | 15 +++++++++++++++
devel/ddd/files/r7410.patch | 29 +++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ddd/Portfile b/devel/ddd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8dbdf9e5e33..95f34171e0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ddd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ddd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</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 ddd
version 3.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 952664d887de7f1f94fe124ac287c340738b723d \
sha256 5d4cbc8a0bb0458543866d679308c53a3ef066e402fe5a1918e19698a3d3580f \
size 5742233
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,12 +19,16 @@ homepage https://www.gnu.org/software/ddd/
</span> master_sites gnu
depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib:libXm:openmotif \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXaw \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib:libXm:openmotif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXaw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles r7360.patch r7410.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles r7360.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-crash.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --enable-builtin-manual \
--enable-builtin-app-defaults
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ddd/files/patch-fix-crash.diff b/devel/ddd/files/patch-fix-crash.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..22a493b9c10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ddd/files/patch-fix-crash.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Athena overrides Motif's vendorShellWidgetClass which breaks internal Motif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+code that uses XmIsVendorShell. Changing the link order resolves this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Both libraries use __attribute__((constructor)) on Darwin to set this value.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ddd/Makefile.in.orig 2023-05-09 04:03:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ddd/Makefile.in 2024-05-14 16:24:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1390,7 +1390,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBX11 = @X_PRE_LIBS@ @X11_LIBS@ @X_EXTRA_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # All libraries shown above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXAW) $(LIBXMU) $(LIBXT) $(LIBXPM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ALL_X_LIBS = $(X_LDFLAGS) $(LIBXAW) $(LIBXM) $(LIBXMU) $(LIBXT) $(LIBXPM) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBXP) $(LIBXEXT) $(LIBX11) $(LIBGEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ddd_SOURCES = ddd.C \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ddd/files/r7410.patch b/devel/ddd/files/r7410.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..155eed5ac7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ddd/files/r7410.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ddd/ddd.C 2024/01/12 21:23:32 7409
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ddd/ddd.C 2024/01/13 13:23:07 7410
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,7 +193,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "graph/GraphEdit.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "GDBAgent.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "HistoryD.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "motif/LabelH.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "motif/MakeMenu.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PlotAgent.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "SourceView.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,6 +298,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>++#include "box/FontTable.h" // for the define USE_XFT_LIB
</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;'>+ // Forward function decls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2322,10 +2322,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+- // Setup label hack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arg = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XtCreateWidget("label_hack", xmLabelHackWidgetClass, toplevel, args, arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set key bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setup_cut_copy_paste_bindings(XtDatabase(XtDisplay(toplevel)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setup_select_all_bindings(XtDatabase(XtDisplay(toplevel)));
</span></pre><pre style='margin:0'>
</pre>