[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
124/331: gnu: libsecret: Update package definition.
From: |
guix-commits |
Subject: |
124/331: gnu: libsecret: Update package definition. |
Date: |
Fri, 14 Aug 2020 11:13:16 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit fee389fe3c10ca7632a3ca315d6a8b0e58e7c00e
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Thu Jul 9 18:34:16 2020 -0400
gnu: libsecret: Update package definition.
* gnu/packages/gnome.scm (libsecret): Update package definition.
[build-system]: Change from gnu to meson.
[arguments]<#:glib-or-gtk?>: New argument.
<#:tests?>: Remove argument.
<#:configure-flags>[--with-html-dir]: Remove flag.
<#:phases>['patch-docbook-xml]: New phase.
['check]: New phase.
['move-docs]: New phase.
[native-inputs]: Add dbus, docbook-xml, docbook-xsl, gtk-doc,
python-wrapper, python-dbus and python-pygobject.
[inputs]: Remove docbook-xsl and libgcrypt.
[propagated-inputs]: Add libgcrypt.
[synopsis]: Modify.
[description]: Modify.
[license]: Add asl2.0 and gpl2+.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gnome.scm | 100 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c4b3506..3ee49fe 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4339,49 +4339,81 @@ and the GLib main loop, to integrate well with GNOME
applications.")
(package
(name "libsecret")
(version "0.20.3")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "mirror://gnome/sources/libsecret/"
- (version-major+minor version) "/"
- "libsecret-" version ".tar.xz"))
- (sha256
- (base32
- "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"))))
- (build-system gnu-build-system)
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"))))
+ (build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:tests? #f ; FIXME: Testing hangs.
- #:configure-flags
- (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))))
+ `(#:glib-or-gtk? #t
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "man/secret-tool.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.2")
+ "/xml/dtd/docbook/")))
+ (substitute* '("reference/libsecret/libsecret-docs.sgml"
+ "reference/libsecret/libsecret-examples.sgml"
+ "reference/libsecret/libsecret-using.sgml")
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+ "/xml/dtd/docbook/"))))))
+ (replace 'check
+ (lambda _
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (invoke "dbus-launch" "meson" "test")
+ #t))
+ (add-after 'install 'move-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
+ `(("dbus" ,dbus)
+ ("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+ ("docbook-xml-4.2" ,docbook-xml-4.2)
+ ("docbook-xsl" ,docbook-xsl)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("python-dbus" ,python-dbus)
+ ("python-pygobject" ,python-pygobject)
("vala" ,vala)
("xsltproc" ,libxslt)))
- ;; These are needed for the tests.
- ;; FIXME: Add gjs once available.
- ;("dbus" ,dbus)
- ;("python2" ,python-2)
- ;("python2-dbus" ,python2-dbus)
- ;("python2-pygobject" ,python2-pygobject)
- ;("python2-pygobject-2" ,python2-pygobject-2)))
- (propagated-inputs
- `(("glib" ,glib))) ; required by libsecret-1.pc
(inputs
- `(("docbook-xsl" ,docbook-xsl)
- ("libgcrypt" ,libgcrypt)
- ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES
+ `(("libxml2" ,libxml2)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("libgcrypt" ,libgcrypt)))
+ (synopsis "GObject bindings for Secret Service API")
+ (description "Libsecret is a library for storing and retrieving passwords
+and other secrets. It communicates with the Secret Service, using D-Bus.
+Gnome-Keyring and Ksecretservice are both implementations of a Secret
Service.")
(home-page "https://wiki.gnome.org/Projects/Libsecret/")
- (synopsis "GObject bindings for \"Secret Service\" API")
- (description
- "Libsecret is a GObject based library for storing and retrieving passwords
-and other secrets. It communicates with the \"Secret Service\" using DBus.")
- (license license:lgpl2.1+)))
+ (license
+ (list
+ ;; Tests
+ license:asl2.0
+ license:gpl2+
+ ;; Others
+ license:lgpl2.1+))))
(define-public five-or-more
(package
- 130/331: gnu: Add libdatrie., (continued)
- 130/331: gnu: Add libdatrie., guix-commits, 2020/08/14
- 88/331: gnu: gtk+: Propagate libcloudproviders., guix-commits, 2020/08/14
- 93/331: gnu: libgdata: Update package definition., guix-commits, 2020/08/14
- 100/331: gnu: ibus: Update package definition., guix-commits, 2020/08/14
- 101/331: gnu: json-glib: Update package definition., guix-commits, 2020/08/14
- 109/331: gnu: Add rust-serial-test-derive@0.4.0., guix-commits, 2020/08/14
- 112/331: gnu: Add rust-serial-test-derive@0.1.0., guix-commits, 2020/08/14
- 120/331: gnu: Add rust-servo-arc@0.1.1., guix-commits, 2020/08/14
- 122/331: gnu: Add rust-xml5ever@0.16.1., guix-commits, 2020/08/14
- 123/331: gnu: librsvg-next: Update package definition., guix-commits, 2020/08/14
- 124/331: gnu: libsecret: Update package definition.,
guix-commits <=
- 131/331: gnu: Add libthai., guix-commits, 2020/08/14
- 132/331: gnu: pango: Update package definition., guix-commits, 2020/08/14
- 136/331: gnu: woff2: Update package definition., guix-commits, 2020/08/14
- 137/331: gnu: Add wpewebkit., guix-commits, 2020/08/14
- 139/331: gnu: Add xmltoman., guix-commits, 2020/08/14
- 146/331: gnu: pixman: Update package definition., guix-commits, 2020/08/14
- 148/331: gnu: libsigc++: Update package definition., guix-commits, 2020/08/14
- 149/331: gnu: Add libsigc++-2., guix-commits, 2020/08/14
- 155/331: gnu: pangomm: Update package definition., guix-commits, 2020/08/14
- 118/331: gnu: Add rust-pin-project@0.4.22., guix-commits, 2020/08/14