From: Brice Waegeneire <brice@waegenei.re>
To: 41193@debbugs.gnu.org
Subject: [bug#41193] [PATCH 07/13] gnu: libnma: Update inputs and licenses.
Date: Mon, 11 May 2020 21:00:40 +0200 [thread overview]
Message-ID: <20200511190046.27155-7-brice@waegenei.re> (raw)
In-Reply-To: <20200511185022.23667-1-brice@waegenei.re>
* gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and
add phase 'patch-docbook-xml'.
[native-inputs]: Add 'docboock-xml-4.3' and 'vala'.
[inputs]: Remove 'adwaita'icon-theme'.
[license]: Add 'lgpl2.1+'.
---
gnu/packages/gnome.scm | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fd2a1506f4..251c4d89cd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -818,16 +818,26 @@ client devices can handle.")
"09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t))
+ `(#: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")))
+ #t))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gcr" ,gcr)
+ `(("gcr" ,gcr)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
@@ -837,10 +847,10 @@ client devices can handle.")
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 license:gpl2+
+ license:lgpl2.1+))))
(define-public gnome-menus
(package
--
2.26.2
next prev parent reply other threads:[~2020-05-11 19:02 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 18:50 [bug#41193] [PATCH 00/13] Update network-manager suite Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 01/13] gnu: network-manager: Update to 1.24.0 Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 02/13] gnu: network-manager: Add iwd support Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 03/13] gnu: network-manager: Switch to meson-build-system Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 04/13] gnu: network-manager: Appease guix lint Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 05/13] gnu: modem-manager: Update to 1.12.10 Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 06/13] gnu: libnma: Update to 1.8.28 Brice Waegeneire
2020-05-11 19:00 ` Brice Waegeneire [this message]
2020-05-11 20:00 ` [bug#41193] [PATCH 07/13] gnu: libnma: Update inputs and licenses Leo Famulari
2020-05-12 21:18 ` Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 08/13] gnu: libnma: Adjust indentation Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 09/13] gnu: network-manager-openvpn: Update to 1.8.12 Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 10/13] gnu: network-manager-openconnect: Use libnma Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 11/13] gnu: network-manager-vpnc: " Brice Waegeneire
2020-05-11 20:01 ` Leo Famulari
2020-05-22 18:20 ` Jonathan Brielmaier
2020-05-11 19:00 ` [bug#41193] [PATCH 12/13] gnu: network-manager-applet: Update to 1.16.0 Brice Waegeneire
2020-05-11 19:00 ` [bug#41193] [PATCH 13/13] gnu: network-manager-applet: Appease guix lint Brice Waegeneire
2020-05-11 20:05 ` [bug#41193] [PATCH 00/13] Update network-manager suite Leo Famulari
2020-05-12 21:12 ` Brice Waegeneire
2020-05-12 21:36 ` Leo Famulari
2020-05-22 16:35 ` Brice Waegeneire
2020-05-22 20:04 ` Leo Famulari
2020-05-22 17:12 ` [bug#41193] [PATCH v2 00/15] " Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 01/15] gnu: network-manager: Update to 1.24.0 Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 02/15] gnu: network-manager: Add iwd support Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 03/15] gnu: network-manager: Switch to meson-build-system Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 04/15] gnu: network-manager: Appease guix lint Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 05/15] gnu: modem-manager: Update to 1.12.10 Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 06/15] gnu: libnma: Update to 1.8.28 Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 07/15] gnu: libnma: Update inputs Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 08/15] gnu: libnma: Adjust indentation Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 09/15] gnu: network-manager-openvpn: Update to 1.8.12 Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 10/15] gnu: network-manager-openconnect: Use libnma Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 11/15] gnu: network-manager-vpnc: Use 'libnma' Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 12/15] gnu: network-manager-applet: Update to 1.16.0 Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 13/15] gnu: network-manager-applet: Appease guix lint Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 14/15] gnu: gnome-initial-setup: Use 'libnma' Brice Waegeneire
2020-05-22 17:12 ` [bug#41193] [PATCH v2 15/15] gnu: gnome-control-center: " Brice Waegeneire
2020-05-22 20:05 ` [bug#41193] [PATCH v2 00/15] Update network-manager suite Leo Famulari
2020-05-22 21:23 ` bug#41193: " Brice Waegeneire
2020-05-22 19:48 ` [bug#41193] [PATCH 11/13] gnu: network-manager-vpnc: Use libnma Brice Waegeneire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200511190046.27155-7-brice@waegenei.re \
--to=brice@waegenei.re \
--cc=41193@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).