Attachment 241344 Details for Bug 270693 – [patch] avoid tclsh8.5

[patch] [patch] avoid tclsh8.5

pr-neomutt-tclsh8.5-failure.diff (text/plain), 1.54 KB, created by John Hein on 2023-04-07 23:50:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-04-07 23:50:49 UTC

Size: 1.54 KB

patch

obsolete

>diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
>index 7758a1fe5579..643c6941a7e4 100644
>--- a/mail/neomutt/Makefile
>+++ b/mail/neomutt/Makefile
>@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
> SHEBANG_FILES=	contrib/smime_keys
> 
> 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
>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