From patchwork Mon May 11 19:00:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 22014 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3C3C027BBE3; Mon, 11 May 2020 20:02:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 08B9827BBE1 for ; Mon, 11 May 2020 20:02:32 +0100 (BST) Received: from localhost ([::1]:39982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYDh9-00024T-E7 for patchwork@mira.cbaines.net; Mon, 11 May 2020 15:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDgh-0001vt-Ks for guix-patches@gnu.org; Mon, 11 May 2020 15:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYDgh-0004on-B7 for guix-patches@gnu.org; Mon, 11 May 2020 15:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jYDgh-0004OH-96 for guix-patches@gnu.org; Mon, 11 May 2020 15:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41193] [PATCH 07/13] gnu: libnma: Update inputs and licenses. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 May 2020 19:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41193 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41193@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158922369116741 (code B ref -1); Mon, 11 May 2020 19:02:03 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2020 19:01:31 +0000 Received: from localhost ([127.0.0.1]:53301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDgA-0004Lr-Pk for submit@debbugs.gnu.org; Mon, 11 May 2020 15:01:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:44448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDg4-0004KX-J0 for submit@debbugs.gnu.org; Mon, 11 May 2020 15:01:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDg4-0001Om-9t for guix-patches@gnu.org; Mon, 11 May 2020 15:01:24 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:60943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDfh-0004dB-TT for guix-patches@gnu.org; Mon, 11 May 2020 15:01:23 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 813F4E0006 for ; Mon, 11 May 2020 19:01:00 +0000 (UTC) From: Brice Waegeneire Date: Mon, 11 May 2020 21:00:40 +0200 Message-Id: <20200511190046.27155-7-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511185022.23667-1-brice@waegenei.re> References: <20200511185022.23667-1-brice@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.196; envelope-from=brice@waegenei.re; helo=relay4-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 14:53:15 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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