Merge pull request #6576 from freshprince/neomutt-update

neomutt: update to 20170602
This commit is contained in:
Enno Boland 2017-06-05 14:47:01 +02:00 committed by GitHub
commit d962928e92
2 changed files with 39 additions and 2 deletions

View file

@ -0,0 +1,37 @@
From 0d8ca5bd48cdfeb0d8e67bd3aa9d48aac9c4cc64 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Sat, 3 Jun 2017 14:28:31 +0000
Subject: [PATCH] build: allow xsltproc and w3m calls to fail
---
doc/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git doc/Makefile.am doc/Makefile.am
index de614bbb2..663ca282e 100644
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -106,7 +106,7 @@ uninstall-local:
check:
manual.txt: manual.html
- LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \
+ -LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \
LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
@@ -115,12 +115,12 @@ Muttrc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
$(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
manual.html: manual.xml $(srcdir)/html.xsl $(srcdir)/mutt.xsl $(srcdir)/mutt.css
- xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+ -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
$(CHUNKED_DOCFILES): index.html
index.html: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl manual.xml $(srcdir)/mutt.css
- xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
+ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
validate: manual.xml
xmllint --noout --noblanks --postvalid $<

View file

@ -1,6 +1,6 @@
# Template file for 'neomutt'
pkgname=neomutt
version=20170428
version=20170602
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
@ -17,7 +17,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2"
homepage="http://www.neomutt.org"
distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz"
checksum=c6100c6afb120b6eb2810e9acae6512fc4851ebd7fe711c5bc40b3ee29c0d306
checksum=53762f867a8a6213ebbc65199058d476347467340bff6b56816de1b6d09ff0cf
case "${XBPS_TARGET_MACHINE}" in
x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";;