Attachment 238584 Details for Bug 268208 – mail/mutt: fix build with clang 15

[patch] mail/mutt: fix build with clang 15

mail__mutt-fix-clang15-build-1.diff (text/plain), 2.94 KB, created by Dimitry Andric on 2022-12-06 21:00:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-12-06 21:00:06 UTC

Size: 2.94 KB

patch

obsolete

>commit 8375904e9f2caf2867379f60ac11b626615b3138
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Tue Dec 6 21:53:39 2022 +0100
>
>    mail/mutt: fix build with clang 15
>    
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    mail/mutt failed to build with clang (and lld) 15:
>    
>        --- init.o ---
>        In file included from init.c:43:
>        ./init.h:3166:37: error: incompatible integer to pointer conversion initializing 'void *' with an expression of type 'int' [-Wint-conversion]
>          { "quote_empty",      DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>                                                 ^~~~~~~~~~~~~
>        ./init.h:3166:37: warning: suggest braces around initialization of subobject [-Wmissing-braces]
>          { "quote_empty",      DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>                                                 ^~~~~~~~~~~~~
>                                                 {            }
>        ./init.h:3166:52: error: incompatible integer to pointer conversion initializing 'void *' with an expression of type 'int' [-Wint-conversion]
>          { "quote_empty",      DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>                                                                ^
>        ./init.h:3166:52: warning: suggest braces around initialization of subobject [-Wmissing-braces]
>          { "quote_empty",      DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>                                                                ^
>    
>    This is because the QUOTE_PATCH option is on by default, and that quote
>    patch does not properly initialize the union members for the MuttVars
>    variable.
>
>diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
>index 30e700b51515..b9e02a9a8c0e 100644
>--- a/mail/mutt/Makefile
>+++ b/mail/mutt/Makefile
>@@ -173,6 +173,7 @@ NLS_CONFIGURE_ENABLE=	nls
> 
> QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
> 			mutt-${GREETING_PATCH_VERSION}.vvv.quote:vc
>+QUOTE_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-quote
> 
> REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
> 
>diff --git a/mail/mutt/files/extra-patch-quote b/mail/mutt/files/extra-patch-quote
>new file mode 100644
>index 000000000000..33dc9010ae03
>--- /dev/null
>+++ b/mail/mutt/files/extra-patch-quote
>@@ -0,0 +1,18 @@
>+--- init.h.orig	2022-09-14 14:12:12 UTC
>++++ init.h
>+@@ -3163,13 +3163,13 @@ struct option_t MuttVars[] = {
>+   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
>+   ** prompted for confirmation when you try to quit.
>+   */
>+-  { "quote_empty",	DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>++  { "quote_empty",	DT_BOOL, R_NONE, {.l=OPTQUOTEEMPTY}, {.l=1} },
>+   /*
>+   ** .pp
>+   ** Controls whether or not empty lines will be quoted using
>+   ** ``$indent_string''.
>+   */
>+-  { "quote_quoted",	DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0 },
>++  { "quote_quoted",	DT_BOOL, R_NONE, {.l=OPTQUOTEQUOTED}, {.l=0} },
>+   /*
>+   ** .pp
>+   ** Controls how quoted lines will be quoted. If set, one quote

Actions: View | Diff

Attachments on bug 268208: 238584