[bug#29043] neomutt update to 20171027 and 2 additional neomutt related commits

[bug#29043] neomutt update to 20171027 and 2 additional neomutt related commits

[ng0]

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

Patch 1 updates neomutt - so far so functional.
Patch 2 removes the inherit from mutt, it is not necessary,
the only shared component was the license and the build-system.
Patch 3 removes 2 configure switches that were dropped in some
of the last versions.

Other non-fatal issues exist that I'll fix upstream (those
have no effect on the build we do).
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://dist.ng0.infotropique.org/dist/keys/
https://www.infotropique.org https://ng0.infotropique.org

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

From 473b631eb8c3cb6cc805855d757b4458d9b5c5e7 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 28 Oct 2017 15:48:29 +0000
Subject: [PATCH 1/3] gnu: neomutt: Update to 20171027.

* gnu/packages/mail.scm (neomutt): Update to 20171027.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e9a7283cf..c94c5f8f0 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -277,7 +277,7 @@ operating systems.")
   (package
     (inherit mutt)
     (name "neomutt")
-    (version "20171013")
+    (version "20171027")
     (source
      (origin
        (method url-fetch)
@@ -285,7 +285,7 @@ operating systems.")
                            "/archive/" name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0mcs5rhlajyxl0bw2hpwcwx14rzrgk6sf8yr0gdj1di3sq166z2s"))))
+         "10z523cy3s6syh0mwpsncl87wrvyzsk99y7nzicwvx6y3hmdw01d"))))
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
        ("gdbm" ,gdbm)
-- 
2.14.3


[-- Attachment #1.3: 0002-gnu-neomutt-Do-not-inherit-mutt.patch --]
[-- Type: text/plain, Size: 1368 bytes --]

From 4adac48836914f2cd8bcd0eb51a51804e62a3333 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 28 Oct 2017 16:23:01 +0000
Subject: [PATCH 2/3] gnu: neomutt: Do not inherit mutt.

* gnu/packages/mail.scm (neomutt): Remove (inherit mutt),
add 'build-system' and 'license'.
---
 gnu/packages/mail.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c94c5f8f0..ed095dd9d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -275,7 +275,6 @@ operating systems.")
 
 (define-public neomutt
   (package
-    (inherit mutt)
     (name "neomutt")
     (version "20171027")
     (source
@@ -286,6 +285,7 @@ operating systems.")
        (sha256
         (base32
          "10z523cy3s6syh0mwpsncl87wrvyzsk99y7nzicwvx6y3hmdw01d"))))
+    (build-system gnu-build-system)
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
        ("gdbm" ,gdbm)
@@ -346,7 +346,8 @@ operating systems.")
     (synopsis "Command-line mail reader based on Mutt")
     (description
      "NeoMutt is a command-line mail reader which is based on mutt.
-It adds a large amount of new and improved features to mutt.")))
+It adds a large amount of new and improved features to mutt.")
+    (license gpl2+)))
 
 (define-public gmime
   (package
-- 
2.14.3


[-- Attachment #1.4: 0003-gnu-neomutt-Remove-obsolete-configure-switches.patch --]
[-- Type: text/plain, Size: 1132 bytes --]

From fde05347982a40ec40d86d90cc3abd70af116e00 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 28 Oct 2017 16:26:57 +0000
Subject: [PATCH 3/3] gnu: neomutt: Remove obsolete configure switches.

* gnu/packages/mail.scm (neomutt)[arguments]: Remove '--with-regex'
and '--with-external-dotlock' from configure-flags.
---
 gnu/packages/mail.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ed095dd9d..149315806 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -323,7 +323,6 @@ operating systems.")
              "--without-ssl"
              "--with-sasl"
 
-             "--with-regex"
              "--enable-smime"
              "--enable-notmuch"
              "--with-idn"
@@ -333,8 +332,6 @@ operating systems.")
              ;; in the chroot. The workaround is this.
              "--with-mailpath=/var/mail"
 
-             "--with-external-dotlock"
-
              (string-append "--with-curses="
                             (assoc-ref %build-inputs "ncurses")))
        #:phases
-- 
2.14.3


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

bug#29043: neomutt update to 20171027 and 2 additional neomutt related commits

[Ludovic Courtès]

ng0 <ng0@infotropique.org> skribis:

> Patch 1 updates neomutt - so far so functional.
> Patch 2 removes the inherit from mutt, it is not necessary,
> the only shared component was the license and the build-system.
> Patch 3 removes 2 configure switches that were dropped in some
> of the last versions.

I applied the 3 patches, thank you!

Ludo’.