<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d116fe23608893bb75f490bc809cb293d853490f">https://github.com/macports/macports-ports/commit/d116fe23608893bb75f490bc809cb293d853490f</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 d116fe2 neomutt: fix trash_append
</span>d116fe2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d116fe23608893bb75f490bc809cb293d853490f
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Fri Feb 28 00:54:50 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> neomutt: fix trash_append
</span>---
mail/neomutt/Portfile | 4 ++-
...patch-Fix-old-append-trick-in-trash_append.diff | 31 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/neomutt/Portfile b/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f9220cf..8d3fc02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/neomutt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup neomutt neomutt 20191207
<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 mail
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,8 @@ depends_lib path:bin/perl:perl5 \
</span> port:zlib
depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Fix-old-append-trick-in-trash_append.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# Use MacPorts Perl
reinplace -W ${worksrcpath} "s|/usr/bin/perl|${prefix}/bin/perl|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff b/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..76ce718
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/neomutt/files/patch-Fix-old-append-trick-in-trash_append.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 815627e19ee760d71a0eb02dd404219ac3a70626 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Pietro Cerutti <gahr@gahr.ch>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 30 Dec 2019 10:27:21 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix 'old append' trick in trash_append
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #2048
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mx.c | 4 +---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mx.c mx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 709f1e9cb..4ea46a2dc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -537,12 +537,10 @@ static int trash_append(struct Mailbox *m)
</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;'>+ struct Mailbox *m_trash = mx_path_resolve(C_Trash);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const bool old_append = m_trash->append;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct Context *ctx_trash = mx_mbox_open(m_trash, MUTT_APPEND);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ctx_trash)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool old_append = m_trash->append;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_trash->append = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* continue from initial scan above */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = first_del; i < m->msg_count; i++)
</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;'>+2.25.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>