GNU bug report logs - #41193
[PATCH 00/13] Update network-manager suite

Previous Next

Full log

Message #88 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH v2 07/15] gnu: libnma: Update inputs.
Date: Fri, 22 May 2020 19:12:38 +0200

* 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'.

squash! gnu: libnma: Update inputs and licenses.
---
 gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2bf055c7fd..ec532dcd9b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -819,16 +819,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,11 +847,10 @@ client devices can handle.")
    (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+)))
+    (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+)))
 
 (define-public gnome-menus
   (package
-- 
2.26.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.