Summary: | mail-client/mutt-1.11.1 - colours kill the mail start | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | pmn <darwinskernel> |
Component: | Current packages | Assignee: | Fabian Groffen <grobian> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | kevin, net-mail+disabled |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
See Also: | https://gitlab.com/muttmua/mutt/issues/109 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- |
Description
pmn
2018-12-31 15:16:08 UTC
add upstream report ref. Inside features-extra/0011-feature-notmuch.patch. At the part where it patches pattern.c, I would suggest adding a check: Original fragment of the patch: diff -r 1694913a8bf8 -r 0de8383bc638 pattern.c --- a/pattern.c Sun Dec 02 18:57:02 2018 +0100 +++ b/pattern.c Sun Dec 02 18:57:05 2018 +0100 @@ -1402,6 +1409,13 @@ mutt_pattern_exec (struct pattern_t *pat return (pat->not ^ ((h->security & PGPKEY) == PGPKEY)); case MUTT_XLABEL: return (pat->not ^ (h->env->x_label && patmatch (pat, h->env->x_label) == 0)); +#ifdef USE_NOTMUCH + case MUTT_NOTMUCH_LABEL: + { + char *tags = nm_header_get_tags(h); + return (pat->not ^ (tags && patmatch (pat, tags) == 0)); + } +#endif case MUTT_HORMEL: return (pat->not ^ (h->env->spam && h->env->spam->data && patmatch (pat, h->env->spam->data) == 0)); case MUTT_DUPLICATED: Change this fragment to: +#ifdef USE_NOTMUCH + case MUTT_NOTMUCH_LABEL: + { + char *tags; + if (!ctx || (ctx->magic != MUTT_NOTMUCH)) + return 0; + tags = nm_header_get_tags(h); + return (pat->not ^ (tags && patmatch (pat, tags) == 0)); + } +#endif Thanks Kevin! Sgt. Garcia, can you test a change for me if I give you some instructions? @Sgt. Garcia: % cd /usr/portage/mail-client/mutt % sed -i -e '/^PATCHREV=/s/r0/r1/' mutt-1.11.1.ebuild % ebuild mutt-1.11.1.ebuild digest # emerge =mutt-1.11.1 The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df596d62c4acc8e63139433ac8241b93931bd8a commit 3df596d62c4acc8e63139433ac8241b93931bd8a Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2019-01-02 10:54:07 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2019-01-02 10:54:25 +0000 mail-client/mutt: revbump to fix some patches Bug: https://bugs.gentoo.org/674176 Bug: https://bugs.gentoo.org/674202 Signed-off-by: Fabian Groffen <grobian@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 mail-client/mutt/Manifest | 2 +- mail-client/mutt/{mutt-1.11.1.ebuild => mutt-1.11.1-r1.ebuild} | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) -r1 includes the change, could you please confirm that version fixes it? (In reply to Fabian Groffen from comment #6) > -r1 includes the change, could you please confirm that version fixes it? fixed thanks. |