From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1engaM-0003Ri-Cg for guix-patches@gnu.org; Mon, 19 Feb 2018 03:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1engaJ-0003OD-05 for guix-patches@gnu.org; Mon, 19 Feb 2018 03:14:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:42563) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1engaI-0003O3-Om for guix-patches@gnu.org; Mon, 19 Feb 2018 03:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1engaI-00066j-D5 for guix-patches@gnu.org; Mon, 19 Feb 2018 03:14:02 -0500 Subject: [bug#30509] neomutt: Update to 20171215 Resent-Message-ID: Date: Mon, 19 Feb 2018 08:13:53 +0000 From: ng0 Message-ID: <20180219081353.ywx2ehxvedx3j6nb@abyayala> References: <87tvuezboa.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5f6z5wexs42rrsnu" Content-Disposition: inline In-Reply-To: <87tvuezboa.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30509@debbugs.gnu.org --5f6z5wexs42rrsnu Content-Type: multipart/mixed; boundary="3enilgnp5qwjiqmu" Content-Disposition: inline --3enilgnp5qwjiqmu Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Forgot to append the last commit change. Here's an update. ng0@crash.cx transcribed 6.7K bytes: > I've got some advice in ircs://freenode/#neomut today and this is > the result. Build system changed, updating is a priority before > "unbundling" (autosetup is meant to be bundled, and mutt includes > autosetup without any local changes to it). > From 5be342abc1ccc7ea9bb4d0c038d8a899a020edb0 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 18 Feb 2018 12:57:00 +0000 > Subject: [PATCH] gnu: neomutt: Update to 20171215. >=20 > * gnu/packages/mail.scm (neomutt): Update to 20171215. > [inputs]: Move "docbook-xsl" to [native-inputs]. > [native-inputs]: Remove "autoconf". Add "tcl", "docbook-xml", "w3m". > [argumnets]: Switch to autosetup based build. Add new phases "fix-sasl-te= st", > "fix-docbook". Remove phase "autoconf". > --- > gnu/packages/mail.scm | 94 ++++++++++++++++++++++++++++++++++++---------= ------ > 1 file changed, 67 insertions(+), 27 deletions(-) >=20 > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index 03568a4a9..76505559e 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -15,7 +15,7 @@ > ;;; Copyright =C2=A9 2016 Lukas Gradl > ;;; Copyright =C2=A9 2016 Alex Kost > ;;; Copyright =C2=A9 2016, 2017 Troy Sankey > -;;; Copyright =C2=A9 2016, 2017, 2018 ng0 > +;;; Copyright =C2=A9 2016, 2017, 2018 ng0 > ;;; Copyright =C2=A9 2016 Cl=C3=A9ment Lassieur > ;;; Copyright =C2=A9 2016, 2017 Arun Isaac > ;;; Copyright =C2=A9 2016 John Darrington > @@ -102,6 +102,7 @@ > #:use-module (gnu packages networking) > #:use-module (gnu packages web) > #:use-module (gnu packages webkit) > + #:use-module (gnu packages w3m) > #:use-module (gnu packages xml) > #:use-module (gnu packages xorg) > #:use-module (gnu packages docbook) > @@ -294,7 +295,7 @@ operating systems.") > (define-public neomutt > (package > (name "neomutt") > - (version "20171208") > + (version "20171215") > (source > (origin > (method url-fetch) > @@ -302,7 +303,7 @@ operating systems.") > "/archive/" name "-" version ".tar.gz")) > (sha256 > (base32 > - "0dfp7m794ws6vg029zx7wrrjrscrnmi8cvbzqzgxafl97bbjipwz")))) > + "1df1c2ynvivna42ifj1lxmgb0bbfih0ggn1afyniadzjm6cnxdvz")))) > (build-system gnu-build-system) > (inputs > `(("cyrus-sasl" ,cyrus-sasl) > @@ -320,43 +321,82 @@ operating systems.") > ("docbook-xsl" ,docbook-xsl) > ("notmuch" ,notmuch))) > (native-inputs > - `(("autoconf" ,autoconf) > - ("automake" ,automake) > + `(("automake" ,automake) > ("gettext-minimal" ,gettext-minimal) > - ("pkg-config" ,pkg-config))) > + ("pkg-config" ,pkg-config) > + ("docbook-xsl" ,docbook-xsl) > + ("docbook-xml" ,docbook-xml) > + ("w3m" ,w3m) > + ("tcl" ,tcl))) > (arguments > - `(#:configure-flags > - (list "--enable-gpgme" > + `(#:tests? #f > + #:configure-flags > + (list "--gpgme" > =20 > ;; database, implies header caching > - "--without-tokyocabinet" > - "--without-qdbm" > - "--without-bdb" > - "--with-lmdb" > - (string-append "--with-kyotocabinet=3D" > - (assoc-ref %build-inputs "kyotocabinet")) > - "--with-gdbm" > - > - "--with-gnutls" > - "--without-ssl" > - "--with-sasl" > - > - "--enable-smime" > - "--enable-notmuch" > - "--with-idn" > + "--disable-tokyocabinet" > + "--disable-qdbm" > + "--disable-bdb" > + "--lmdb" > + "--kyotocabinet" > + > + "--gdbm" > + > + "--gnutls" > + "--disable-ssl" > + "--sasl" > + (string-append "--with-sasl=3D" > + (assoc-ref %build-inputs "cyrus-sasl")) > + > + > + "--smime" > + "--notmuch" > + "--idn" > =20 > ;; If we do not set this, neomutt wants to check > ;; whether the path exists, which it does not > ;; in the chroot. The workaround is this. > "--with-mailpath=3D/var/mail" > =20 > - (string-append "--with-curses=3D" > - (assoc-ref %build-inputs "ncurses"))) > + "--with-ui=3Dncurses" > + (string-append "--with-ncurses=3D" > + (assoc-ref %build-inputs "ncurses")) > + (string-append "--prefix=3D" > + (assoc-ref %outputs "out")) > + "--debug") > #:phases > (modify-phases %standard-phases > - (add-after 'unpack 'autoconf > + ;; TODO: autosetup is meant to be included in the source, > + ;; but we should package autosetup and use our own version of i= t. > + (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 _ > - (zero? (system* "sh" "autoreconf" "-vfi"))))))) > + ;; Upstream suggestion to fix the failing sasl autosetup te= st. > + (substitute* "auto.def" > + (("cc-with \\[list -cflags -I\\$prefix/include -libs") > + "cc-with [list -includes stddef.h -cflags -I$prefix/incl= ude -libs")) > + #t)) > + (replace 'configure > + (lambda* (#:key outputs inputs configure-flags #:allow-other-= keys) > + (let* ((out (assoc-ref outputs "out")) > + (flags `(,@configure-flags)) > + (bash (which "bash"))) > + (setenv "SHELL" bash) > + (setenv "CONFIG_SHELL" bash) > + (zero? (apply system* bash > + (string-append (getcwd) "/configure") > + flags)))))))) > (home-page "https://www.neomutt.org/") > (synopsis "Command-line mail reader based on Mutt") > (description > --=20 > 2.16.1 >=20 > --=20 > ng0 :: https://crash.cx > A88C8ADD129828D7EAC02E52E22F9BBFEE348588 :: https://crash.cx/keys/ --=20 ng0 :: https://crash.cx A88C8ADD129828D7EAC02E52E22F9BBFEE348588 :: https://crash.cx/keys/ --3enilgnp5qwjiqmu Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-neomutt-Update-to-20171215.patch" Content-Transfer-Encoding: quoted-printable =46rom d594a0b91ed7a3733e563eb8d92562df2919fb62 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sun, 18 Feb 2018 12:57:00 +0000 Subject: [PATCH] gnu: neomutt: Update to 20171215. * gnu/packages/mail.scm (neomutt): Update to 20171215. [inputs]: Move "docbook-xsl" to [native-inputs]. [native-inputs]: Remove "autoconf". Add "tcl", "docbook-xml", "w3m". [argumnets]: Switch to autosetup based build. Add new phases "fix-sasl-test= ", "fix-docbook". Remove phase "autoconf". --- gnu/packages/mail.scm | 95 ++++++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2ff61bbf9..a01e157c4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -15,7 +15,7 @@ ;;; Copyright =C2=A9 2016 Lukas Gradl ;;; Copyright =C2=A9 2016 Alex Kost ;;; Copyright =C2=A9 2016, 2017 Troy Sankey -;;; Copyright =C2=A9 2016, 2017, 2018 ng0 +;;; Copyright =C2=A9 2016, 2017, 2018 ng0 ;;; Copyright =C2=A9 2016 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2016, 2017, 2018 Arun Isaac ;;; Copyright =C2=A9 2016 John Darrington @@ -103,6 +103,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages web) #:use-module (gnu packages webkit) + #:use-module (gnu packages w3m) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages docbook) @@ -295,7 +296,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20171208") + (version "20171215") (source (origin (method url-fetch) @@ -303,7 +304,7 @@ operating systems.") "/archive/" name "-" version ".tar.gz")) (sha256 (base32 - "0dfp7m794ws6vg029zx7wrrjrscrnmi8cvbzqzgxafl97bbjipwz")))) + "1df1c2ynvivna42ifj1lxmgb0bbfih0ggn1afyniadzjm6cnxdvz")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -318,46 +319,84 @@ operating systems.") ("libidn" ,libidn) ("libxml2" ,libxml2) ("lmdb" ,lmdb) - ("docbook-xsl" ,docbook-xsl) ("notmuch" ,notmuch))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) + `(("automake" ,automake) ("gettext-minimal" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml) + ("w3m" ,w3m) + ("tcl" ,tcl))) (arguments - `(#:configure-flags - (list "--enable-gpgme" + `(#:tests? #f + #:configure-flags + (list "--gpgme" =20 ;; database, implies header caching - "--without-tokyocabinet" - "--without-qdbm" - "--without-bdb" - "--with-lmdb" - (string-append "--with-kyotocabinet=3D" - (assoc-ref %build-inputs "kyotocabinet")) - "--with-gdbm" - - "--with-gnutls" - "--without-ssl" - "--with-sasl" - - "--enable-smime" - "--enable-notmuch" - "--with-idn" + "--disable-tokyocabinet" + "--disable-qdbm" + "--disable-bdb" + "--lmdb" + "--kyotocabinet" + + "--gdbm" + + "--gnutls" + "--disable-ssl" + "--sasl" + (string-append "--with-sasl=3D" + (assoc-ref %build-inputs "cyrus-sasl")) + + + "--smime" + "--notmuch" + "--idn" =20 ;; If we do not set this, neomutt wants to check ;; whether the path exists, which it does not ;; in the chroot. The workaround is this. "--with-mailpath=3D/var/mail" =20 - (string-append "--with-curses=3D" - (assoc-ref %build-inputs "ncurses"))) + "--with-ui=3Dncurses" + (string-append "--with-ncurses=3D" + (assoc-ref %build-inputs "ncurses")) + (string-append "--prefix=3D" + (assoc-ref %outputs "out")) + "--debug") #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf + ;; 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 _ - (zero? (system* "sh" "autoreconf" "-vfi"))))))) + ;; Upstream suggestion to fix the failing sasl autosetup test. + (substitute* "auto.def" + (("cc-with \\[list -cflags -I\\$prefix/include -libs") + "cc-with [list -includes stddef.h -cflags -I$prefix/includ= e -libs")) + #t)) + (replace 'configure + (lambda* (#:key outputs inputs configure-flags #:allow-other-ke= ys) + (let* ((out (assoc-ref outputs "out")) + (flags `(,@configure-flags)) + (bash (which "bash"))) + (setenv "SHELL" bash) + (setenv "CONFIG_SHELL" bash) + (zero? (apply system* bash + (string-append (getcwd) "/configure") + flags)))))))) (home-page "https://www.neomutt.org/") (synopsis "Command-line mail reader based on Mutt") (description --=20 2.16.1 --3enilgnp5qwjiqmu-- --5f6z5wexs42rrsnu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlqKh0EACgkQ4i+bv+40 hYiS2xAAkGOKz9Fihn9ME5yCPaVrGoNqfK0boVq3rbz/7SRszY2qOi0b/n6BKP+M BFv1wNdPsEtLiGXCdy+tEgQ7N7zlWlTrp/iaJBIFYI7Wy9ZMr+ujCNFsUfQb/0Zi OAF1mXTYKr9DDzNVybzP3rVN4uMYWcO84XQxXBHZLE6/mnGwiffONXd7MITek999 QRKw3Fs+adlR2qDTvwVoP3QRPqdsRBI4g92M8/3g06b8l81GqrquTsfUaiuOfZ/a aYNYC/NcnGoVSRDmN/271ZUstKbEQPm0OqwR2Uwpt0Cy2ilGcAFsEz1yGMymFNKL bsmG3ltW050qPz5HfllfCuvOiGnkqtOZljNDOiohenavZXNzS226B3YjZ+66t4EP R7cpEohGyGPkTMSlOAFTz0zHK/TIjRoJc8BIow3VDgUTyYmxbDd9CbdpmTSnOHq6 PcQuAMMfDjq3Xk+y5dpp+QxwfnfoZwQcEmKoRJnpUN5XMeSW0vjASxWD3G+YzzTs kBjsg8bycb1qw3Pe7PY8l002UcY8D9XJkiwbVvgVZfZaREhhuzECBCc7aavtnsIM SLImUjficg6Dr/7wb1ElyKVaKtrd8Ivm/klddx8LsjvMBKS/9Bjg2oaQzXfWmB/k V5zB0aEjGE/zkfk7xO1zfjAOPDijZWA7svzLVq6YbVNM/rdje/8= =4UWM -----END PGP SIGNATURE----- --5f6z5wexs42rrsnu--