gnu: gmime: Update to 2.6.20.

* gnu/packages/mail.scm (gmime): Update to 2.6.20.
[arguments]: Use modify-phases syntax.
This commit is contained in:
Efraim Flashner 2015-12-09 15:21:34 +02:00
parent 8d5e7ad29a
commit cc9553562c

View file

@ -8,6 +8,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -208,7 +209,7 @@ (define-public mutt
(define-public gmime (define-public gmime
(package (package
(name "gmime") (name "gmime")
(version "2.6.19") (version "2.6.20")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/gmime/" (uri (string-append "mirror://gnome/sources/gmime/"
@ -216,7 +217,7 @@ (define-public gmime
"/gmime-" version ".tar.xz")) "/gmime-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg")))) "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -226,20 +227,21 @@ (define-public gmime
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-after (modify-phases %standard-phases
'unpack 'patch-paths-in-tests (add-after
(lambda _ 'unpack 'patch-paths-in-tests
;; The test programs run several programs using 'system' with (lambda _
;; hard-coded paths. Here we patch them all. We also change "gpg" ;; The test programs run several programs using 'system' with
;; to "gpg2". We use ISO-8859-1 here because test-iconv.c contains ;; hard-coded paths. Here we patch them all. We also change "gpg"
;; raw byte sequences in several different encodings. ;; to "gpg2". We use ISO-8859-1 here because test-iconv.c contains
(with-fluids ((%default-port-encoding #f)) ;; raw byte sequences in several different encodings.
(substitute* (find-files "tests" "\\.c$") (with-fluids ((%default-port-encoding #f))
(("(system *\\(\")(/[^ ]*)" all pre prog-path) (substitute* (find-files "tests" "\\.c$")
(let* ((base (basename prog-path)) (("(system *\\(\")(/[^ ]*)" all pre prog-path)
(prog (which (if (string=? base "gpg") "gpg2" base)))) (let* ((base (basename prog-path))
(string-append pre (or prog (error "not found: " base)))))))) (prog (which (if (string=? base "gpg") "gpg2" base))))
%standard-phases))) (string-append pre
(or prog (error "not found: " base))))))))))))
(home-page "http://spruce.sourceforge.net/gmime/") (home-page "http://spruce.sourceforge.net/gmime/")
(synopsis "MIME message parser and creator library") (synopsis "MIME message parser and creator library")
(description (description