From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CEltN0lJXmDgPQAAgWs5BA (envelope-from ) for ; Fri, 26 Mar 2021 21:51:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mAwvMUlJXmDtfQAA1q6Kng (envelope-from ) for ; Fri, 26 Mar 2021 20:51:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6AADF1A71D for ; Fri, 26 Mar 2021 21:51:21 +0100 (CET) Received: from localhost ([::1]:49098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPtQO-00060p-J8 for larch@yhetil.org; Fri, 26 Mar 2021 16:51:20 -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: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616791881; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=kFQxRDau3LbMtJzQZPj6GgIWc6CsBNm/e2RXVAN/RBY=; b=M/yK/IcHpfInjkrKWjR/IK3stOq7BYQ1Wtf2c0uF090pUTArigcFwXoL0qddPM6GT6qlZR auxxOcT/58tWcNy0F80+uD5Qgmzr0c4krEU0JAYM8YUCvuLBRq8dGVujr9DAN/Lk1zZsGP VG93OF6MBHUkv4TgPXL8MU92yN3yBsV0tqK03c1RkgcgMQWeH8ANEp6tiICpCPNmvNpQqk c66jGa4a9BNOpQrrvEzqgdwANvUO7Xu4bf6d6aSlqZMYrx2/oBKez8rPOGkn5GwQuBUSWx ZD8lG06yawyvFh+vt31I4uG3UrhH21sX5gdQCJPitwfGh2oz7Jgl3p2tg1/VfA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616791881; a=rsa-sha256; cv=none; b=jAZM/ttmTcL01FzAgy0BQOEiij6A8cmJKS77KBnmvvloi51ZGawuiZRc/7jX1LsnS+4sYX NMQCrBgCZ5J6AT/HgtdwmEm426mgZGJzMBZnJhGVnNfPf0zJHrY7FH0SpRhugdyKhEJGXk hbObW7cvKac7PnJrTA9H6rM8fPtdtEXod2w02ZstYueOBKAg3FuuRWGWAx7nAetiHFz835 gnvuIa1u7QwXtsCHar3WZ9PYsNErIA8S19H0uryK+ESzsGHnflCYkWtUNRJmfcVCxOlgHu EIRrCAcahjlQY5dzStJDs/CvFn3bUBOR9sbT1ysFPpwFBz1PuzycCV7l/c43qw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=YRlstLXW; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -5.02 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=YRlstLXW; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6AADF1A71D X-Spam-Score: -5.02 X-Migadu-Scanner: scn0.migadu.com X-TUID: o3WmjnGJgRsI This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I Content-Type: multipart/mixed; boundary="abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> In-Reply-To: --abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD Content-Type: multipart/mixed; boundary="------------BBFDB28B43640D799F39247D" Content-Language: en-US This is a multi-part message in MIME format. --------------BBFDB28B43640D799F39247D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @(rekado|lle-bout|danny) > So I have attached all the patches for this batch. These are=20 > non-signed-off, just for the record. :) Had to make a change to 0068. Attached the modified patch. Regards, RG. --------------BBFDB28B43640D799F39247D Content-Type: text/x-patch; charset=UTF-8; name="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" =46rom 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= =2E * 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=3Dtrue" + "-Dman=3Dtrue") + #: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") --=20 2.31.0 --------------BBFDB28B43640D799F39247D-- --abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD-- --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYF5GXgUDAAAAAAAKCRBfWBZkf4vlURqL AQCxdXBtF3Dl3Zx/O+vdgU/anO9nSNeR9y4BmR8NxRRouwD+Je81hGcg0RMo2k5a/3k8og6cKtCS IWDECmsA6e38/wQ= =hTq9 -----END PGP SIGNATURE----- --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I--