mutt: Update from 1.13.5 to 1.14.0

This commit is contained in:
Fredrik Fornwall 2020-05-11 11:31:56 +02:00
parent 68c26a21d2
commit e71451b473
2 changed files with 18 additions and 8 deletions

View File

@ -1,10 +1,11 @@
TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=1.13.5
TERMUX_PKG_VERSION=1.14.0
TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653
TERMUX_PKG_SHA256=df2e82a83ad38c9a9fd36f44c5ab2b726defa4bb1a17de794dd3800f3353f9f8
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support, zlib, libiconv"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
mutt_cv_c99_snprintf=yes
@ -28,22 +29,19 @@ bin/flea
bin/muttbug
share/man/man1/muttbug.1
share/man/man1/flea.1
etc/mime.types
etc/mime.types.dist
"
TERMUX_PKG_CONFFILES="etc/Muttrc"
termux_step_post_configure() {
# Build wants to run mutt_md5 and makedoc:
# Build wants to run mutt_md5:
gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5
gcc -DHAVE_STRERROR $TERMUX_PKG_SRCDIR/doc/makedoc.c -o $TERMUX_PKG_BUILDDIR/doc/makedoc
touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc
touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5
}
termux_step_post_make_install() {
cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man
mkdir -p $TERMUX_PREFIX/share/examples/mutt/
cp $TERMUX_PKG_SRCDIR/contrib/gpg.rc $TERMUX_PREFIX/share/examples/mutt/gpg.rc
mv $TERMUX_PREFIX/etc/mime.types.dist $TERMUX_PREFIX/etc/mime.types
mv $TERMUX_PREFIX/etc/Muttrc.dist $TERMUX_PREFIX/etc/Muttrc
}

View File

@ -0,0 +1,12 @@
diff -u -r ../mutt-1.14.0/doc/Muttrc.head ./doc/Muttrc.head
--- ../mutt-1.14.0/doc/Muttrc.head 2020-05-02 21:08:56.000000000 +0000
+++ ./doc/Muttrc.head 2020-05-11 09:29:03.417162000 +0000
@@ -23,7 +23,7 @@
"call urlview to extract URLs out of a message"
# Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,pager <F1> "<shell-escape> less @TERMUX_PREFIX@/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
# note: these macros have been subsumed by the <browse-mailboxes> function.