sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mutt: Update from 1.6.2 to 1.7.0

Browse Source 
Also drop neomutt for now since the trash patch has been included.
This commit is contained in:
Fredrik Fornwall 2016-08-31 06:06:18 -04:00
parent fe11968337
commit 3d335c3ab0
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/mutt/build.sh
View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
_MUTT_VERSION=1.6.2
_NEOMUTT_PATCHES=20160808
TERMUX_PKG_VERSION=${_MUTT_VERSION}.$_NEOMUTT_PATCHES
TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${_MUTT_VERSION}.tar.gz
TERMUX_PKG_VERSION=1.7.0
TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache --with-sasl"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
@ -14,21 +13,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-gpgme"
# bin/{flea,muttbug}: File bug against mutt:
TERMUX_PKG_RM_AFTER_INSTALL="bin/flea bin/muttbug share/man/man1/muttbug.1 share/man/man1/flea.1"
termux_step_post_extract_package () {
local PATCHES_TARNAME=neomutt-patches-${_NEOMUTT_PATCHES}.tar.gz
local PATCHES_TARPATH=$TERMUX_PKG_CACHEDIR/neomutt-patches-${_NEOMUTT_PATCHES}.tar.gz
if [ ! -f $PATCHES_TARPATH ]; then
curl --retry 3 -L -o $PATCHES_TARPATH https://github.com/neomutt/neomutt/releases/download/neomutt-${_NEOMUTT_PATCHES}/$PATCHES_TARNAME
fi
local PATCHES_DIR=$TERMUX_PKG_TMPDIR/neomutt-patches
mkdir -p $PATCHES_DIR
$TERMUX_TAR -xf $PATCHES_TARPATH --directory $PATCHES_DIR
cd $TERMUX_PKG_SRCDIR
patch --forward -p1 < $PATCHES_DIR/neomutt-${_NEOMUTT_PATCHES}/neomutt-${_NEOMUTT_PATCHES}.patch || true
}
termux_step_post_configure () {
# Build wants to run mutt_md5 and makedoc:
gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5

12
packages/mutt/makefile.in.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../mutt-1.5.24/Makefile.in ./Makefile.in
--- ../mutt-1.5.24/Makefile.in 2015-08-30 13:24:26.000000000 -0400
+++ ./Makefile.in 2015-11-08 01:39:51.544139704 -0500
@@ -458,7 +458,7 @@
AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)