From 34b327ac5b8edddd11df7c4b0231399044127a1c Mon Sep 17 00:00:00 2001 From: David Flatz Date: Fri, 2 Jun 2017 14:14:11 +0200 Subject: [PATCH] neomutt: update to 20170602 --- srcpkgs/neomutt/patches/fix-doc-build.patch | 37 +++++++++++++++++++++ srcpkgs/neomutt/template | 4 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/neomutt/patches/fix-doc-build.patch diff --git a/srcpkgs/neomutt/patches/fix-doc-build.patch b/srcpkgs/neomutt/patches/fix-doc-build.patch new file mode 100644 index 00000000000..cbfc86c5bed --- /dev/null +++ b/srcpkgs/neomutt/patches/fix-doc-build.patch @@ -0,0 +1,37 @@ +From 0d8ca5bd48cdfeb0d8e67bd3aa9d48aac9c4cc64 Mon Sep 17 00:00:00 2001 +From: Zero King +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 $< diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 747e25ea0f9..6f03f30ed32 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -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 " 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";;