Subject: Re: [bug#30605] neomutt update

From: ng0 <[email-masked]>
Date: Sun, 25 Feb 2018 14:07:22 +0000

ng0 transcribed 2.9K bytes:
> Update to 20180223.
> -- 
> ng0
> A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> http://krosos.org | https://n0.is/~ng0/ | https://crash.cx

Separate patch, but this needs to be applied after the update.
Docbook was telling us that the version didn't match, with the
correct version it no longer pulls in the files from SF.net

-- 
ng0
A88C8ADD129828D7EAC02E52E22F9BBFEE348588
http://krosos.org | https://n0.is/~ng0/ | https://crash.cx

From 5ba1bcba28e5083ceb307b7a6b08f49f439aaedc Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Sun, 25 Feb 2018 14:03:29 +0000
Subject: [PATCH] gnu: neomutt: Remove 'fix-docbook' phase.

* gnu/packages/mail.scm (neomutt)[arguments]: Remove 'fix-docbook' phases.
---
 gnu/packages/mail.scm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index a9d87459c..9fbfddbec 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -368,18 +368,6 @@ operating systems.")
        (modify-phases %standard-phases
          ;; TODO: autosetup is meant to be included in the source,
          ;; but we should package autosetup and use our own version of it.
-         (add-before 'configure 'fix-docbook
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("doc/chunk.xsl" "doc/manual.xml.tail"
-                            "doc/html.xsl" "doc/manual.xml.head")
-               (("http://docbook.sourceforge.net/release/xsl/current/")
-                (string-append (assoc-ref inputs "docbook-xsl")
-                               "/xml/xsl/docbook-xsl-"
-                               ,(package-version docbook-xsl) "/"))
-               (("http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd")
-                (string-append (assoc-ref inputs "docbook-xml")
-                               "/xml/dtd/docbook/docbookx.dtd")))
-             #t))
          (add-before 'configure 'fix-sasl-test
            (lambda _
              ;; Upstream suggestion to fix the failing sasl autosetup test.
-- 
2.16.2