From patchwork Fri Mar 26 20:38:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28131 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 4186727BC5D; Fri, 26 Mar 2021 20:51:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 ESMTPS id 8405827BC5C for ; Fri, 26 Mar 2021 20:51:20 +0000 (GMT) Received: from localhost ([::1]:49098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPtQN-00060p-MV for patchwork@mira.cbaines.net; Fri, 26 Mar 2021 16:51:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPtFS-0003vp-Hw for guix-patches@gnu.org; Fri, 26 Mar 2021 16:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPtFS-0006kS-8P for guix-patches@gnu.org; Fri, 26 Mar 2021 16:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPtFS-0002GP-6S for guix-patches@gnu.org; Fri, 26 Mar 2021 16:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] Big changes from wip-desktop. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Mar 2021 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?utf-8?q?L=C3=A9o?= Le Bouter Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.16167911568643 (code B ref 42958); Fri, 26 Mar 2021 20:40:02 +0000 Received: (at 42958) by debbugs.gnu.org; 26 Mar 2021 20:39:16 +0000 Received: from localhost ([127.0.0.1]:42614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtEh-0002FK-M1 for submit@debbugs.gnu.org; Fri, 26 Mar 2021 16:39:16 -0400 Received: from out1.migadu.com ([91.121.223.63]:29036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtEQ-0002Ee-Qi for 42958@debbugs.gnu.org; Fri, 26 Mar 2021 16:39:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616791136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kFQxRDau3LbMtJzQZPj6GgIWc6CsBNm/e2RXVAN/RBY=; b=YRlstLXWyK7JTDN4lurP13ot3cdYm320q28irKzSU5mDr5TbTD9JQA4ALBNklZzA8UL/v+ 12z8UEU4pvfGMf0dwwSBEVT1r+//+GfkJQgPBOZoH0+WpyL3zoMS4EeH/7JQHicjUZ+1YQ L02FkB7jtFrApwV/DmF2UdwwKWbOtjqB+KlRE0lcb4J6kvuSDCnkDNGnOyn1dUFuopbbLI xzXPrOADclJoY/ciAk50j/qOsbMn78Rd5Ug6F6CDsJ+P/QxX+L7cjFanyBLx3rNioP3Wqm x8aAiZQo3va7aaFy67QvplEUMJgY0n0L7HDacH93CQHIRJOnw4K+PnkzkIVr5Q== References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Message-ID: <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> Date: Fri, 26 Mar 2021 16:38:53 -0400 MIME-Version: 1.0 In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches @(rekado|lle-bout|danny) > So I have attached all the patches for this batch. These are > non-signed-off, just for the record. :) Had to make a change to 0068. Attached the modified patch. Regards, RG. From fa06e0c98bf09b75fda1b738d083c3334712a601 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:27:59 -0400 Subject: [PATCH 68/83] gnu: json-glib: Enable documentation and man-pages. * gnu/packages/gnome.scm (json-glib) [outputs]: New output "doc". [arguments]<#:configure-flags>[-Ddocs]: New flag. [-Dman]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22fd435feb..e56adee111 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4562,13 +4562,45 @@ configuration storage systems.") (base32 "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Ddocs=true" + "-Dman=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.2/")))) + #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) + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") -- 2.31.0