<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/ceae5f65f914b1a3384889143e2eeb3eb0f632ca">https://github.com/macports/macports-ports/commit/ceae5f65f914b1a3384889143e2eeb3eb0f632ca</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 ceae5f65f91 mlterm: fix reading config
</span>ceae5f65f91 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ceae5f65f914b1a3384889143e2eeb3eb0f632ca
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Apr 1 16:02:30 2025 +0400
<span style='display:block; white-space:pre;color:#404040;'> mlterm: fix reading config
</span>---
x11/mlterm/Portfile | 18 +++++---
x11/mlterm/files/patch-fix-undefined-behavior.diff | 54 ++++++++++++++++++++++
2 files changed, 65 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mlterm/Portfile b/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94b303a68e9..521e8d0e225 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup openssl 1.0
</span>
name mlterm
version 3.9.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 8c11694b8f5faeb03d7e5efffef3ea38867fad06 \
sha256 171de4c4f3443bc1211cc51df5caa0e082ffcdd33ab3ce261bc0a4cfe85d9b5e \
size 4227568
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,8 @@ depends_lib-append port:fontconfig \
</span> port:fribidi \
port:libsdl2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-undefined-behavior.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
file copy {*}[glob ${worksrcpath}/doc/*] \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,15 +73,17 @@ variant x11 conflicts sdl2 quartz {
</span> variant quartz conflicts sdl2 x11 {
configure.args-append --with-gui=quartz
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/cocoa/mlterm.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app_dir ${applications_dir}/mlterm.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/mlterm ${destroot}${app_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/libexec/mlterm/mlconfig ${destroot}${app_dir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_dir ${applications_dir}/mlterm.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bin_dir ${app_dir}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/cocoa/mlterm.app ${destroot}${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/etc/mlterm ${destroot}${app_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${bin_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/mlterm ${destroot}${bin_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/mlterm/mlconfig ${destroot}${bin_dir}
</span> # Using a symlink doesn't work because the app can't find its data files.
set fp [open ${destroot}${prefix}/bin/mlterm w 0755]
puts ${fp} "#!/bin/sh"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} "exec '${app_dir}/mlterm' \"$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "exec '${bin_dir}/mlterm' \"$@\""
</span> close ${fp}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mlterm/files/patch-fix-undefined-behavior.diff b/x11/mlterm/files/patch-fix-undefined-behavior.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..44f73f491db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mlterm/files/patch-fix-undefined-behavior.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git main/main-cocoa.m main/main-cocoa.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6a7039fd..6265798a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main/main-cocoa.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main/main-cocoa.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,17 +51,20 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_lang();
</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;'>+-#ifdef COCOA_TOUCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *bundle = [[[NSBundle mainBundle] bundlePath] UTF8String];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef COCOA_TOUCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((path = alloca(strlen(bundle) + 5))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(path, bundle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(path, "/etc");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bl_set_sys_conf_dir(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bl_set_sys_conf_dir([[[NSBundle mainBundle] bundlePath] UTF8String]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((path = alloca(strlen(bundle) + 1))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(path, bundle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bl_set_sys_conf_dir(path);
</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;'>+ @finally {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git uitoolkit/quartz/ui_color.c uitoolkit/quartz/ui_color.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2e01bda9..b0e853d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- uitoolkit/quartz/ui_color.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ uitoolkit/quartz/ui_color.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,8 @@ int ui_load_named_xcolor(ui_display_t *disp, ui_color_t *xcolor, const char *nam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ui_load_rgb_xcolor(ui_display_t *disp, ui_color_t *xcolor, u_int8_t red, u_int8_t green,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u_int8_t blue, u_int8_t alpha) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xcolor->pixel = (red << 16) | (green << 8) | blue | (alpha << 24);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xcolor->pixel = ((u_int32_t) alpha << 24) | ((u_int32_t) red << 16) |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((u_int32_t) green << 8) | blue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git uitoolkit/ui_screen_manager.c uitoolkit/ui_screen_manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 80bb8a9f..705dcf8a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- uitoolkit/ui_screen_manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ uitoolkit/ui_screen_manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1478,7 +1478,7 @@ void ui_close_dead_screens(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (count = MSU - 1; count >= 0; count--) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dead_mask[idx] & (0x1 << count)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (dead_mask[idx] & (0x1u << count)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_screen_t *screen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __DEBUG
</span></pre><pre style='margin:0'>
</pre>