Attachment 241373 Details for Bug 270693 – [patch] v2: avoid tclsh8.5, fix stage-qa

[patch] [patch] v2: avoid tclsh8.5, fix stage-qa

pr-neomutt-tclsh8.5-failure.diff (text/plain), 3.13 KB, created by John Hein on 2023-04-09 11:45:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-04-09 11:45:22 UTC

Size: 3.13 KB

patch

obsolete

>diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
>index 7758a1fe5579..e3c46cbfd4d3 100644
>--- a/mail/neomutt/Makefile
>+++ b/mail/neomutt/Makefile
>@@ -13,23 +13,34 @@ RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
> 		urlview:textproc/urlview
> LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
> 
>-USES=		cpe iconv:translit localbase ncurses perl5 pkgconfig shebangfix ssl
>+USES=		cpe iconv:translit localbase ncurses perl5 pkgconfig \
>+		python:env shebangfix ssl
> 
> USE_GITHUB=	yes
> USE_PERL5=	build
>-MAKE_JOBS_UNSAFE=	yes
>+
>+SHEBANG_FILES=	contrib/oauth2/mutt_oauth2.py contrib/smime_keys \
>+		data/account-command/macos-keychain/keychain.py
> 
> HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARGS} \
>+		--disable-idn \
>+		--fmemopen \
>+		--locales-fix \
>+		--mandir=${PREFIX}/man \
>+		--pcre2 \
>+		--with-ssl="${OPENSSLBASE}"
>+CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
> 
>-OPTIONS_SUB=	yes
>-SHEBANG_FILES=	contrib/smime_keys
>+MAKE_JOBS_UNSAFE=	yes
> 
> OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
>-OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE
>+OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB GSSAPI_BASE
> OPTIONS_MULTI=	HCACHE
> OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
> OPTIONS_SINGLE=	GSSAPI
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SUB=	yes
> 
> FLOCK_DESC=	Use flock() to lock files
> GPGME_DESC=	Use gpgme to handle pgp
>@@ -41,15 +52,6 @@ QDBM_DESC=		Quick DataBase Manager support
> TOKYOCABINET_DESC=	Tokyo Cabinet support
> SCREEN_DESC=	Screen options
> 
>-CONFIGURE_ARGS=	--with-ssl="${OPENSSLBASE}" \
>-		--locales-fix \
>-		--fmemopen \
>-		--pcre2 \
>-		--disable-idn \
>-		--mandir=${PREFIX}/man \
>-		${ICONV_CONFIGURE_ARGS}
>-CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
>-
> # Header cache
> BDB_CONFIGURE_ON=		--bdb
> BDB_USES=			bdb
>@@ -90,6 +92,7 @@ GSSAPI_HEIMDAL_USES=		gssapi:heimdal
> GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${LOCALBASE}
> GSSAPI_MIT_USES=		gssapi:mit
> GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${LOCALBASE}
>+GSSAPI_NONE_CONFIGURE_ON=	--disable-gss
> 
> DOCS_CONFIGURE_OFF=	--disable-doc
> DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
>diff --git a/mail/neomutt/files/patch-autosetup_autosetup-find-tclsh b/mail/neomutt/files/patch-autosetup_autosetup-find-tclsh
>new file mode 100644
>index 000000000000..3ab9dc9b7d14
>--- /dev/null
>+++ b/mail/neomutt/files/patch-autosetup_autosetup-find-tclsh
>@@ -0,0 +1,15 @@
>+auto.def started using 'lmap' between`neomutt-20220429`and neomutt-20230322
>+tclsh8.5 does not support that.
>+https://github.com/neomutt/neomutt/issues/3808
>+
>+--- autosetup/autosetup-find-tclsh.orig	2023-03-22 15:35:11 UTC
>++++ autosetup/autosetup-find-tclsh
>+@@ -4,7 +4,7 @@
>+ # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works)
>+ # If an argument is given, use that as the test instead of autosetup-test-tclsh
>+ d="`dirname "$0"`"
>+-for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do
>++for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.6 tclsh8.7; do
>+ 	{ $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
>+ done
>+ echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"

Actions: View | Diff

Attachments on bug 270693: 241344 | 241373