cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mail/mutt: fix build with clang 15

Browse Source 
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.

PR:		268208
Approved by:	dereks@lifeofadishwasher.com (maintainer)
MFH:		2022Q4
This commit is contained in:
Dimitry Andric 2022-12-06 21:53:39 +01:00
parent d3fa0778aa
commit de5264ca78
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/mutt/Makefile
View File

@ -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

18
mail/mutt/files/extra-patch-quote Normal file
View File

@ -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