From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QLB3OIS6NmFiFQAAgWs5BA (envelope-from ) for ; Tue, 07 Sep 2021 03:04:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0JP+M4S6NmFXHQAAbx9fmQ (envelope-from ) for ; Tue, 07 Sep 2021 01:04:04 +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 BD04A228AB for ; Tue, 7 Sep 2021 03:04:04 +0200 (CEST) Received: from localhost ([::1]:52822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNPWt-0004AW-R6 for larch@yhetil.org; Mon, 06 Sep 2021 21:04:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNPVv-0003a4-Mu for guix-patches@gnu.org; Mon, 06 Sep 2021 21:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNPVv-00059s-Ed for guix-patches@gnu.org; Mon, 06 Sep 2021 21:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNPVv-0004cp-Bv for guix-patches@gnu.org; Mon, 06 Sep 2021 21:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50445] [PATCHES wip-gnome v1 3/4] gnu: gtksourceview: Enable documentation. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Sep 2021 01:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50445 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 50445@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 50445-submit@debbugs.gnu.org id=B50445.163097655517716 (code B ref 50445); Tue, 07 Sep 2021 01:03:03 +0000 Received: (at 50445) by debbugs.gnu.org; 7 Sep 2021 01:02:35 +0000 Received: from localhost ([127.0.0.1]:54839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNPVS-0004bd-OA for submit@debbugs.gnu.org; Mon, 06 Sep 2021 21:02:35 -0400 Received: from out1.migadu.com ([91.121.223.63]:15644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNPVO-0004b7-5c for 50445@debbugs.gnu.org; Mon, 06 Sep 2021 21:02:30 -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=1630976549; 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=aU5s6msclBjXuopZJSnGEcEpBUcai1SqxtXQr9j4B9M=; b=UEeQhatZYUF4SMLRfthrL9GPChsponBa4BYJjyhxfk+9OxoqeEgiJyKGH8xn7/4Mq91ifB qgoRTwq4PRjBdvCm0WEUvj+7Mm4KRu8AiNoR0fxR5NEPYZLOxSWGsY+FW2pK1wPcRXvus8 M323sUf2gjBdo1eO+fUxEwF2WTOrNZJ7iBRK8UqEga5NZK1Bd6bFEPlsE/YhE0cuI2Mi5C 4eo8/281ibjafib/uYFZry0jZmaIGy7wWWVBmYlISKm4O4leQREI2vGzYeV7/iFuA1NqhZ n6IRoph8IbBMvAscTdJ2T0g74/32sG9OfeMsxlqjvqw+vNHZ3XtnkH/X4uUi3A== Date: Mon, 6 Sep 2021 21:02:16 -0400 Message-Id: <20210907010217.12746-3-rg@raghavgururajan.name> In-Reply-To: <20210907010217.12746-1-rg@raghavgururajan.name> References: <20210907010217.12746-1-rg@raghavgururajan.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: BD04A228AB X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZkBp2iAP0KAf * gnu/packages/gtk.scm (gtksourceview)[outputs]: New output "doc". [configure-flags](gtk-doc): New flag. [phases](patch-docbook-xml,move-doc): New phases. [native-inputs]: Add docbook-xml-4.3, docbook-xsl, gtk-doc and libxslt. --- gnu/packages/gtk.scm | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fa3a69d46d..0a80671629 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -548,9 +548,24 @@ printing and other features typical of a source code editor.") (base32 "1hcswszqnsyqzzf5zk8iflxdvkfvvcg89pf6xsqwbyyabwdxfqyi")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - '(#:phases + `(#:configure-flags + (list + ,@(if (%current-target-system) + ;; If true, gtkdoc-scangobj will try to execute a + ;; cross-compiled binary. + '("-Dgtk_doc=false") + '("-Dgtk_doc=true"))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (substitute* (find-files "docs" "\\.xml\\.in$") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append + (assoc-ref (or native-inputs inputs) "docbook-xml-4.3") + "/xml/dtd/docbook/"))))) (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) @@ -560,12 +575,24 @@ printing and other features typical of a source code editor.") (setenv "DISPLAY" ":1") ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") - #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/gtk-doc")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")))))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. + `(("docbook-xml-4.3" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("itstool" ,itstool) ("gobject-introspection" ,gobject-introspection) + ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ("vala" ,vala) ;; For testing. -- 2.33.0