01/01: gnu: mu: Update to 1.3.3.

[guix-commits]

leungbk pushed a commit to branch update-mu
in repository guix.

commit b982d3363d0adc554182c1ec43cf2c7216629900
Author: Brian Leung <address@hidden>
Date:   Sat Aug 24 18:58:58 2019 +0200

    gnu: mu: Update to 1.3.3.
    
    * gnu/packages/mail.scm (mu): Update to 1.3.3.
---
 gnu/packages/mail.scm | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 30ce5cd..378117f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -680,26 +680,32 @@ security functionality including PGP, S/MIME, SSH, and 
SSL.")
 (define-public mu
   (package
     (name "mu")
-    (version "1.2.0")
+    (version "1.3.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/djcb/mu/releases/";
-                                  "download/" (version-major+minor version) "/"
-                                  "mu-" version ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/djcb/mu/";)
+                    (commit version)))
               (sha256
                (base32
-                "0fh5bxvhjqv1p9z783lym8y1k3p4jcc3wg6wf7zl8s6w8krcfd7n"))))
+                "06z1l27rp3dpyphg3zqg0ww568a4g8iwz01vy4f7rl62asrbglsy"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")             ; for gtester
        ("emacs" ,emacs-minimal)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("makeinfo" ,texinfo)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
        ("tzdata" ,tzdata-for-tests)))   ; for mu/test/test-mu-query.c
     ;; TODO: Add webkit and gtk to build the mug GUI.
     (inputs
      `(("xapian" ,xapian)
        ("guile" ,guile-2.2)
        ("glib" ,glib)
+       ("m4" ,m4)
        ("gmime" ,gmime)))
     (arguments
      `(#:modules ((guix build gnu-build-system)
@@ -707,6 +713,8 @@ security functionality including PGP, S/MIME, SSH, and 
SSL.")
                   (guix build emacs-utils))
        #:imported-modules (,@%gnu-build-system-modules
                            (guix build emacs-utils))
+       ;; #:configure-flags
+       ;;  '("--config-cache")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-configure
@@ -715,14 +723,20 @@ security functionality including PGP, S/MIME, SSH, and 
SSL.")
            ;; configure flag doesn't help because "mu4e" will be added to
            ;; the lispdir anyway, so we have to modify "configure.ac".
            (lambda _
-             (substitute* "configure"
-               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")
-               ;; Use latest Guile
-               (("guile-2.0") "guile-2.2"))
-             (substitute* '("guile/Makefile.in"
-                            "guile/mu/Makefile.in")
+             (substitute* "configure.ac"
+               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))
+             (substitute* '("guile/Makefile.am"
+                            "guile/mu/Makefile.am")
                (("share/guile/site/2.0/") "share/guile/site/2.2/"))
+             ;; (substitute* "autogen.sh"
+             ;;   (("^\\./configure") "#"))
              #t))
+         ;; (add-after 'unpack 'set-shell
+         ;;   ;; Setting the SHELL environment variable is required for the 
tests
+         ;;   ;; to find sh.
+         ;;   (lambda _
+         ;;     (setenv "SHELL" (which "sh"))
+         ;;     #t))
          (add-after 'patch-configure 'fix-date-tests
            ;; Loosen test tolerances to prevent failures caused by daylight
            ;; saving time (DST).  See: https://github.com/djcb/mu/issues/1214.