[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
175/277: gnu: gmime: Update package definition.
From: |
guix-commits |
Subject: |
175/277: gnu: gmime: Update package definition. |
Date: |
Thu, 6 Aug 2020 17:03:27 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit 7f6ff3475af554f3f4f120dadf08e6ef5898505c
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Wed Jul 22 12:30:38 2020 -0400
gnu: gmime: Update package definition.
* gnu/packages/mail.scm (gmime): Update package definition.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--enable-gtk-doc]: New flag.
[--with-html-dir]: New flag.
[--with-gpgme-prefix]: New flag.
<#:phases>['patch-paths-in-tests]: Remove phase.
['patch-docbook-xml]: New phase.
['disable-failing-tests]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl,
gobject-introspection, gtk-doc, perl and vala. Remove gnupg.
[inputs]: Add gnupg and libidn2. Remove glib.
[propagated-inputs]: Add glib.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/mail.scm | 86 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 54 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 8563b47..20f81ab 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -136,6 +136,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system guile)
#:use-module (guix build-system perl)
@@ -560,40 +561,61 @@ It adds a large amount of new and improved features to
mutt.")
(package
(name "gmime")
(version "3.2.7")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/gmime/"
- (version-major+minor version)
- "/gmime-" version ".tar.xz"))
- (sha256
- (base32
- "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("gnupg" ,gnupg))) ; for tests only
- (inputs `(("glib" ,glib)
- ("gpgme" ,gpgme)
- ("zlib" ,zlib)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/gmime/"
+ (version-major+minor version)
+ "/gmime-" version ".tar.xz"))
+ (sha256
+ (base32 "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:phases
+ `(#:configure-flags
+ (list
+ "--enable-gtk-doc"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html")
+ (string-append "--with-gpgme-prefix="
+ (assoc-ref %build-inputs "gpgme")))
+ #:phases
(modify-phases %standard-phases
- (add-after
- 'unpack 'patch-paths-in-tests
- (lambda _
- ;; The test programs run several programs using 'system' with
- ;; hard-coded paths. Here we patch them all.
- ;; We use ISO-8859-1 here because test-iconv.c contains
- ;; raw byte sequences in several different encodings.
- (with-fluids ((%default-port-encoding #f))
- (substitute* (find-files "tests" "\\.c$")
- (("(system *\\(\")(/[^ ]*)" all pre prog-path)
- (let* ((base (basename prog-path))
- (prog (which base)))
- (string-append pre
- (or prog (error "not found: " base)))))))
- #t)))))
- (home-page "http://spruce.sourceforge.net/gmime/")
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs/reference"
+ (substitute* "gmime-docs.sgml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'patch-docbook-xml 'disable-failing-tests
+ (lambda _
+ (substitute* "tests/Makefile.in"
+ (("@ENABLE_CRYPTO_TRUE@ test-pgp \\\\")
+ "")
+ (("@ENABLE_CRYPTO_TRUE@ test-pgpmime")
+ "")
+ (("test-mbox test-autocrypt test-mime")
+ "test-mbox test-mime"))
+ #t)))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("docbook-xsl" ,docbook-xsl)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("vapigen" ,vala)))
+ (inputs
+ `(("gnupg" ,gnupg)
+ ("gpgme" ,gpgme)
+ ("libidn2" ,libidn2)
+ ("zlib" ,zlib)))
+ (propagated-inputs
+ `(("glib" ,glib)))
(synopsis "MIME message parser and creator library")
(description
"GMime provides a core library and set of utilities which may be used for
- 164/277: gnu: evolution-data-server: Update package definition., (continued)
- 164/277: gnu: evolution-data-server: Update package definition., guix-commits, 2020/08/06
- 166/277: gnu: Add dee., guix-commits, 2020/08/06
- 168/277: gnu: folks: Update package definition., guix-commits, 2020/08/06
- 169/277: gnu: Add poly2tri-c., guix-commits, 2020/08/06
- 184/277: gnu: grilo: Update package definition., guix-commits, 2020/08/06
- 188/277: gnu: gupnp: Update package definition., guix-commits, 2020/08/06
- 193/277: gnu: gspell: Update package definition., guix-commits, 2020/08/06
- 198/277: gnu: libchamplain: Update package definition., guix-commits, 2020/08/06
- 171/277: gnu: Add mrg., guix-commits, 2020/08/06
- 172/277: gnu: gegl: Update package definition., guix-commits, 2020/08/06
- 175/277: gnu: gmime: Update package definition.,
guix-commits <=
- 176/277: gnu: gnome-autoar: Update package definition., guix-commits, 2020/08/06
- 177/277: gnu: gnome-online-accounts: Update package definition., guix-commits, 2020/08/06
- 178/277: gnu: gfbgraph: Update package definition., guix-commits, 2020/08/06
- 179/277: gnu: gnome-online-miners: Update package definition., guix-commits, 2020/08/06
- 180/277: gnu: gnome-video-effects: Update package definition., guix-commits, 2020/08/06
- 189/277: gnu: gupnp-av: Update package definition., guix-commits, 2020/08/06
- 192/277: gnu: gsound: Update package definition., guix-commits, 2020/08/06
- 201/277: gnu: libgsf: Update package definition., guix-commits, 2020/08/06
- 203/277: gnu: libgudev: Update package definition., guix-commits, 2020/08/06
- 186/277: gnu: Add libdmapsharing., guix-commits, 2020/08/06