From nobody Wed Dec 7 15:35:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NS1ZG5szvz4k6JW; Wed, 7 Dec 2022 15:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NS1ZG5N9bz40t8; Wed, 7 Dec 2022 15:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670427318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHT4WbZuQEtRZfk9HFGdnoanAldpUdS/WQnZCBci/K0=; b=KhMXiJElpcUDQJvq3krqekPRaZ8j3EOC5vxRugGTDs7kxKN88WeiU58Yp6J2rHz+iEGlNo NY1h28iQZaxq4XfgVyH537j0Vd8YcDxVSPtdEcWDaCpzp9CTJDI85VkIS/hZEISCfbkzBC yE6zgOMYuPeF4UV2WwnghdVbklcha6aAK8Tug3BQC3wKoW+t9vwx4vKL946fjES07wrOcm 27O9NamAzmnWn3oa65QLmCJHoD2+zHaUfVwmo3QY6gMKTfxXbb/k8AG1rmaXB2ky8wJmYm fDRaBpJpJIH6WGqZifU0qwMYfgmJM9P1s60SMsdgjyEvtPckSNKG28o5Bc2M/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670427318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHT4WbZuQEtRZfk9HFGdnoanAldpUdS/WQnZCBci/K0=; b=HcbsMA2nsEeBv2+Wm62glv2X3KwnN6ALFTev2YeKN/PsycdIeWLLejNZe109s7DIuHzmr1 yZm/oqCddIaS6GGjAuIK/TOv7HDV2dPqepMUpkXSUn9cU8sAtpc7P7LPEkkQWr/AcuutHL NjumY1EiGacxAyyoLsIIlAcxwtg/fH6wziyzyf7yESiqGM3Mh7xTJHoUZreG+tQFvIEqe8 UqI+sLiRKnTPBSKTCSJOUO5bbnhhzCH7BOzc6xl4IrYK8lANWzn55yuF4quW5ARNKYPh8j JLYCEd/owu6M7mJPLgcBEirwvO0YE7ul8W9e+2IYly2/AJy3P7wX9Zm4YdoTmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670427318; a=rsa-sha256; cv=none; b=ePJ4AtTA9w7V3yhWuhAfVRHQLsq0zirMF9ZVQ/rffzze6O9cek9q67bBujVSWa/ye1O1Bl z99SA9pgJWE13QqYpbl4lcVPGU4mbFv2PsNPobLzkgXNVkK0vfllrhMSuD9fo6nLLhBBNK oAXDrv2vGVH3I0OQmNU1x+NU8Nq08A7VWqRZRk14GpeDUr8kNN5/AWSjg6YGfd3T1yo4j+ duOSCcwziIyYkbsXJgbBh38REJbDtLC0rdZN55kTCO9zA1yJDS7mfBSqnHBhCP13rRehOC GqnYBelpX4mlqYAFY9aAPKueAorLIbUZGL8i9YK51Wf1hwcIIq2+RrBAWeLHiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NS1ZG4RNFzMj5; Wed, 7 Dec 2022 15:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B7FZIKe056867; Wed, 7 Dec 2022 15:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7FZIEl056866; Wed, 7 Dec 2022 15:35:18 GMT (envelope-from git) Date: Wed, 7 Dec 2022 15:35:18 GMT Message-Id: <202212071535.2B7FZIEl056866@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: de5264ca78f4 - main - mail/mutt: fix build with clang 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de5264ca78f41c04c1753ca94d949121b53b9f1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=de5264ca78f41c04c1753ca94d949121b53b9f1d commit de5264ca78f41c04c1753ca94d949121b53b9f1d Author: Dimitry Andric AuthorDate: 2022-12-06 20:53:39 +0000 Commit: Dimitry Andric CommitDate: 2022-12-07 15:34:04 +0000 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. PR: 268208 Approved by: dereks@lifeofadishwasher.com (maintainer) MFH: 2022Q4 --- mail/mutt/Makefile | 1 + mail/mutt/files/extra-patch-quote | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) 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