<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2dd68931a90b2732755027d883438a2c6e1d5ef0">https://github.com/macports/macports-ports/commit/2dd68931a90b2732755027d883438a2c6e1d5ef0</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 2dd68931a90 libgnt: backport upstream patch to fix the build
</span>2dd68931a90 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2dd68931a90b2732755027d883438a2c6e1d5ef0
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu May 23 05:27:53 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libgnt: backport upstream patch to fix the build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Carsten Schmidt <ryandesign@macports.org>
</span>---
devel/libgnt/Portfile | 7 +++--
devel/libgnt/files/patch-PANEL.diff | 58 +++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgnt/Portfile b/devel/libgnt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a33a6c4be1f..0f2cff45ca5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgnt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgnt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,8 @@ PortGroup meson 1.0
</span>
name libgnt
version 2.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
maintainers {devans @dbevans} openmaintainer
description GNT: The GLib Ncurses Toolkit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +33,10 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>
patchfiles ncurses-sys-prefix.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# gntwm.c: error: dereferencing pointer to incomplete type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://keep.imfreedom.org/libgnt/libgnt/rev/2da723f790d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-PANEL.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@MP_PREFIX@@|${prefix}|" ${worksrcpath}/meson.build
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgnt/files/patch-PANEL.diff b/devel/libgnt/files/patch-PANEL.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cc6e73571bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgnt/files/patch-PANEL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gntwm.c 2021-09-26 11:56:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gntwm.c 2024-05-23 05:20:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,38 +166,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sx, ex, sy, ey, w, y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cchar_t ch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PANEL *below = panel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WINDOW *window = panel_window(panel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sx = getbegx(panel->win);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ex = getmaxx(panel->win) + sx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sy = getbegy(panel->win);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ey = getmaxy(panel->win) + sy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx = getbegx(window);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ex = getmaxx(window) + sx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sy = getbegy(window);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ey = getmaxy(window) + sy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((below = panel_below(below)) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sy > getbegy(below->win) + getmaxy(below->win) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ey < getbegy(below->win))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ window = panel_window(below);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sy > getbegy(window) + getmaxy(window) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ey < getbegy(window))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sx > getbegx(below->win) + getmaxx(below->win) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ex < getbegx(below->win))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sx > getbegx(window) + getmaxx(window) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ex < getbegx(window))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto right;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ w = widestringwidth(ch.chars);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (w > 1 && (ch.attr & 1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ch.chars[0] = ' ';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ch.attr &= ~ A_CHARTEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- touchline(below->win, y - getbegy(below->win), 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ touchline(window, y - getbegy(window), 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ right:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ w = widestringwidth(ch.chars);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (w > 1 && !(ch.attr & 1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ch.chars[0] = ' ';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ch.attr &= ~ A_CHARTEXT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- touchline(below->win, y - getbegy(below->win), 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ touchline(window, y - getbegy(window), 1);
</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>