[bug#30605] neomutt update

[bug#30605] neomutt update

[ng0]

[-- Attachment #1.1: Type: text/plain, Size: 131 bytes --]

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

[-- Attachment #1.2: 0001-gnu-neomutt-Update-to-20180223.patch --]
[-- Type: text/plain, Size: 1442 bytes --]

From 1778313906104f849118960e6033d8a07e7d0393 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@crash.cx>
Date: Sun, 25 Feb 2018 13:34:28 +0000
Subject: [PATCH] gnu: neomutt: Update to 20180223.

* gnu/packages/mail.scm (neomutt): Update to 20180223.
[native-inputs]: Use 'docbook-xml-4.2'.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 6e8f9a74a..a9d87459c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -296,7 +296,7 @@ operating systems.")
 (define-public neomutt
   (package
     (name "neomutt")
-    (version "20171215")
+    (version "20180223")
     (source
      (origin
        (method url-fetch)
@@ -304,7 +304,7 @@ operating systems.")
                            "/archive/" name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1df1c2ynvivna42ifj1lxmgb0bbfih0ggn1afyniadzjm6cnxdvz"))))
+         "1fr7158xhrhasylyxp709g9mdbggdmni3qn3baxvczfg2w003fhh"))))
     (build-system gnu-build-system)
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
@@ -325,7 +325,7 @@ operating systems.")
        ("gettext-minimal" ,gettext-minimal)
        ("pkg-config" ,pkg-config)
        ("docbook-xsl" ,docbook-xsl)
-       ("docbook-xml" ,docbook-xml)
+       ("docbook-xml" ,docbook-xml-4.2)
        ("w3m" ,w3m)
        ("tcl" ,tcl)))
     (arguments
-- 
2.16.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30605] neomutt update

[ng0]

[-- Attachment #1.1: Type: text/plain, Size: 475 bytes --]

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

[-- Attachment #1.2: 0001-gnu-neomutt-Remove-fix-docbook-phase.patch --]
[-- Type: text/plain, Size: 1643 bytes --]

From 5ba1bcba28e5083ceb307b7a6b08f49f439aaedc Mon Sep 17 00:00:00 2001
From: ng0 <ng0@crash.cx>
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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#30605: neomutt update

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 142 bytes --]

ng0 <ng0@n0.is> writes:

> Update to 20180223.

Thanks!  I "squashed" the two patches and pushed as
f58764d8ed633a8ad1c9f2578be7bbde36ed7ce7.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]