[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
209/401: gnu: libnma: Update package definition.
From: |
guix-commits |
Subject: |
209/401: gnu: libnma: Update package definition. |
Date: |
Tue, 18 Aug 2020 16:21:34 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit c0d4d9e9829269cc7fd0f3cc4cc8b22fef27aa15
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Mon Jul 27 05:01:13 2020 -0400
gnu: libnma: Update package definition.
* gnu/packages/gnome.scm (libnma) [version]: Update to 1.8.30.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['patch-docbook-xml]: Modify phase.
['move-doc]: New phase.
[inputs]: Add glib. Move network-manager to ...
[propagated-inputs]: ... here.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gnome.scm | 58 ++++++++++++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7aa35c9..97a5ab4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1649,26 +1649,37 @@ client devices can handle.")
(define-public libnma
(package
(name "libnma")
- (version "1.8.28")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
+ (version "1.8.30")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:phases
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* "libnma-docs.xml"
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd")))
+ (substitute* "libnma-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/")))
+ #t))
+ (add-after 'install 'move-doc
+ (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
`(("docbook-xml" ,docbook-xml-4.3)
@@ -1680,18 +1691,23 @@ client devices can handle.")
("vala" ,vala)))
(inputs
`(("gcr" ,gcr)
+ ("glib" ,glib)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
- ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
- ("network-manager" ,network-manager)))
- (synopsis "Network Manager's applet library")
+ ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)))
+ (propagated-inputs
+ `(("libnm" ,network-manager)))
+ (synopsis "Network-Manager Applet Library")
(description "Libnma is an applet library for Network Manager. It was
initially part of network-manager-applet and has now become a separate
project.")
(home-page "https://gitlab.gnome.org/GNOME/libnma")
- ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
- ;; "LGPL-2.1+".
- (license license:gpl2+)))
+ (license
+ (list
+ ;; Library
+ license:gpl2+
+ ;; Others
+ license:lgpl2.1+))))
(define-public gnome-menus
(package
- 179/401: gnu: gnome-online-miners: Update package definition., (continued)
- 179/401: gnu: gnome-online-miners: Update package definition., guix-commits, 2020/08/18
- 180/401: gnu: gnome-video-effects: Update package definition., guix-commits, 2020/08/18
- 182/401: gnu: gdk-pixbuf: Disable failing tests., guix-commits, 2020/08/18
- 186/401: gnu: Add libdmapsharing., guix-commits, 2020/08/18
- 194/401: gnu: gtk-vnc: Update package definition., guix-commits, 2020/08/18
- 198/401: gnu: libchamplain: Update package definition., guix-commits, 2020/08/18
- 203/401: gnu: libgudev: Update package definition., guix-commits, 2020/08/18
- 200/401: gnu: libgnomekbd: Update package definition., guix-commits, 2020/08/18
- 204/401: gnu: glade: Update package definition., guix-commits, 2020/08/18
- 212/401: gnu: libzapojit: Update package definition., guix-commits, 2020/08/18
- 209/401: gnu: libnma: Update package definition.,
guix-commits <=
- 228/401: gnu: tepl: Update package definition., guix-commits, 2020/08/18
- 241/401: gnu: evince: Update package definition., guix-commits, 2020/08/18
- 160/401: gnu: gtksourceviewmm: Update package definition., guix-commits, 2020/08/18
- 173/401: gnu: geocode-glib: Update package definition., guix-commits, 2020/08/18
- 178/401: gnu: gfbgraph: Update package definition., guix-commits, 2020/08/18
- 190/401: gnu: grilo-plugins: Update package definition., guix-commits, 2020/08/18
- 196/401: gnu: Add seed., guix-commits, 2020/08/18
- 213/401: gnu: libdmapsharing: Update home-page., guix-commits, 2020/08/18
- 215/401: gnu: mm-common: Update package definition., guix-commits, 2020/08/18
- 225/401: gnu: gtksourceview: Fix glade., guix-commits, 2020/08/18