From patchwork Mon Oct 9 20:06:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54679 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 6B0B727BBEA; Mon, 9 Oct 2023 21:10:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A6A127BBE2 for ; Mon, 9 Oct 2023 21:10:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYu-00079D-Ki; Mon, 09 Oct 2023 16:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpwYg-0006hr-LJ for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qpwYd-0008CN-8L for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYx-0002ek-W7 for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 31/63] gnu: colord-gtk: Build documentation. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169688214410060 (code B ref 65479); Mon, 09 Oct 2023 20:09:11 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:09:04 +0000 Received: from localhost ([127.0.0.1]:33415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYp-0002c5-JF for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:09:03 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:59548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYn-0002bT-IB for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:09:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 54B2321057 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id BE7F78009E; Mon, 9 Oct 2023 22:07:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id F1a9l1MPXeCC; Mon, 9 Oct 2023 22:07:28 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id BD93480099; Mon, 9 Oct 2023 22:07:26 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:19 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (colord-gtk): Build documentation. [arguments]<#:configure-flags>: Remove. <#:phases>: Add 'split-package phase. [native-inputs]: Add docbook-xsl, gtk-doc/stable and libxslt. [outputs]: Add 'doc output. --- gnu/packages/freedesktop.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bb47d2311f..7f290b89e3 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2019,14 +2019,25 @@ (define-public colord-gtk (sha256 (base32 "1l61ydb0zv2ffilwpapgz5mm3bznr28zl16xqbxnz6kdsrb6cimr")))) + (outputs '("out" "doc")) (build-system meson-build-system) - (arguments '(#:tests? #f ;require the colord system service - ;; Building documentation fails with: "Cannot build man pages - ;; without docbook-xsl-ns". - #:configure-flags (list "-Ddocs=false" "-Dman=false"))) + (arguments + (list + #:tests? #f ;require the colord system service + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'split-package + (lambda _ + (let* ((old (string-append #$output "/share/gtk-doc")) + (new (string-append #$output:doc "/share/gtk-doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) (native-inputs - (list gettext-minimal + (list docbook-xsl + gettext-minimal gobject-introspection + gtk-doc/stable + libxslt pkg-config vala)) (inputs