From patchwork Tue May 18 03:05:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 29394 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 E99C527BC81; Tue, 18 May 2021 04:06:23 +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.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 B2A6727BC78 for ; Tue, 18 May 2021 04:06:23 +0100 (BST) Received: from localhost ([::1]:39956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liq3q-0002TZ-JV for patchwork@mira.cbaines.net; Mon, 17 May 2021 23:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liq3W-0002Sn-DU for guix-patches@gnu.org; Mon, 17 May 2021 23:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1liq3W-0001t7-53 for guix-patches@gnu.org; Mon, 17 May 2021 23:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1liq3V-000406-Tg for guix-patches@gnu.org; Mon, 17 May 2021 23:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48459] [PATCH wip-gnome v2 2/6] gnu: tracker: Enable documentation. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 May 2021 03:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48459@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 48459-submit@debbugs.gnu.org id=B48459.162130714015314 (code B ref 48459); Tue, 18 May 2021 03:06:01 +0000 Received: (at 48459) by debbugs.gnu.org; 18 May 2021 03:05:40 +0000 Received: from localhost ([127.0.0.1]:54166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liq3A-0003yq-F6 for submit@debbugs.gnu.org; Mon, 17 May 2021 23:05:40 -0400 Received: from out1.migadu.com ([91.121.223.63]:59764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liq37-0003yH-OX for 48459@debbugs.gnu.org; Mon, 17 May 2021 23:05:39 -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=1621307136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ky5edpfdb3Ag0haNJfMDOvudR9ujlQ1eUgDgMyb/MG0=; b=Tm00ZWo2oOzRJhi6kHwrUgta6n7tXgkGHXgxLKZYNQv7oWMe7SAN0pWkATzXIM0YZkf+gU J9e9aVxYIo3H5tprKrIDq/+MRsFPuLUttFDc1qj26tC8gMKfQ8GtUNYejL4LTCVCzTDSFy 4kTlmC7MoQL5Oq/k692bSqGgQhLYK+QzrK8/PcAtoJMCgZ489DGqMmHoMZB4xzlyLdpJpF PzWegEx6p0OmlqOlJp+lXjXjvE5NMJHVwWytAxMRweFfRNZYF/qEpWxVhI7Fwx1iTjjfQg g842vMR9YqDi/7mHy3VevEusWtKzyhvZGcvV9+EG6nR5MXQYAIVT+f5mTf80BA== Date: Mon, 17 May 2021 23:05:10 -0400 Message-Id: <20210518030514.6206-2-rg@raghavgururajan.name> In-Reply-To: <20210518030514.6206-1-rg@raghavgururajan.name> References: <20210518030514.6206-1-rg@raghavgururajan.name> MIME-Version: 1.0 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 * gnu/packages/gnome.scm (tracker)[outputs](doc): New output. [configure-flags](docs): New flag. [phases](patch-docbook-xml,move-doc): New phases. [native-inputs]: Add docbook-xml, docbook-xsl and gtk-doc. --- gnu/packages/gnome.scm | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22182c407c..c81d6246b8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8783,23 +8783,52 @@ easy, safe, and automatic.") (base32 "1ixxyqjlv7pnl4j8g6b72fkbjvzfspza8y71ppkncry8i6xkr223")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments `(#:glib-or-gtk? #t #:configure-flags - ;; Otherwise, the RUNPATH will lack the final path component. - (list (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib/tracker-2.0")) + (list + "-Ddocs=true" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib:" + (assoc-ref %outputs "out") "/lib/tracker-2.0")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* (find-files "." "\\..*ml$") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml-4.3") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml-4.1.2") + "/xml/dtd/docbook/")))))) (add-before 'check 'pre-check (lambda _ ;; Some tests expect to write to $HOME. (setenv "HOME" "/tmp") - #t))))) + #t)) + (add-after 'install 'move-doc + (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")))))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2) + ("docbook-xml-4.3" ,docbook-xml-4.3) + ("docbook-xml-4.5" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("python-pygobject" ,python-pygobject) ("intltool" ,intltool) ("pkg-config" ,pkg-config)