From patchwork Sat Sep 23 14:20:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54208 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 F099227BBEA; Sat, 23 Sep 2023 15:24:11 +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,URIBL_BLOCKED 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 7925127BBE2 for ; Sat, 23 Sep 2023 15:24:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3Y1-0000CD-SV; Sat, 23 Sep 2023 10:23:53 -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 1qk3Xz-0000Aa-0x for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:51 -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 1qk3Xy-0003jS-Le for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3Y9-0008BQ-Rc for guix-patches@gnu.org; Sat, 23 Sep 2023 10:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 30/62] gnu: colord-gtk: Build documentation. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:24:01 +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.169547900231371 (code B ref 65479); Sat, 23 Sep 2023 14:24:01 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:23:22 +0000 Received: from localhost ([127.0.0.1]:40288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3XV-00089u-FY for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:23:21 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wu-00086s-2A for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:44 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 79FB620DF0 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E98768009F; Sat, 23 Sep 2023 16:21:29 +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 pMrV2Bfhw0rs; Sat, 23 Sep 2023 16:21:29 +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 C18318009C; Sat, 23 Sep 2023 16:21:28 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:05 +0100 Message-ID: <7a7d7d3f55e09e8922c77cb05a394aa32f1904f6.1695478390.git.mirai@makinata.eu> 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..04b9ac3fd0 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2020,13 +2020,23 @@ (define-public colord-gtk (base32 "1l61ydb0zv2ffilwpapgz5mm3bznr28zl16xqbxnz6kdsrb6cimr")))) (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 @@ -2034,6 +2044,7 @@ (define-public colord-gtk (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) + (outputs (list "out" "doc")) (synopsis "GTK integration for libcolord") (home-page "https://www.freedesktop.org/software/colord/") (description