From patchwork Mon Oct 9 20:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54675 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 77EAB27BBEA; Mon, 9 Oct 2023 21:10:45 +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 C813427BBE2 for ; Mon, 9 Oct 2023 21:10:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYu-00078l-4j; 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 1qpwYZ-0006f7-UB for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:49 -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 1qpwYZ-0008Be-MO for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYu-0002da-EO for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 38/63] gnu: libxkbcommon: Add doc output. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:08 +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.16968821189882 (code B ref 65479); Mon, 09 Oct 2023 20:09:08 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:38 +0000 Received: from localhost ([127.0.0.1]:33385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYP-0002ZC-Al for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:37 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:41564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYH-0002Y8-TQ for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:30 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 11CB9202BD for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 89F65800A7; Mon, 9 Oct 2023 22:07:32 +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 w-WxvOz8IXeH; Mon, 9 Oct 2023 22:07:32 +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 633708009C; Mon, 9 Oct 2023 22:07:30 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:26 +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/xdisorg.scm (libxkbcommon)[arguments]: Restyle. <#:phases>: Add 'move-doc. [outputs]: Add doc. --- gnu/packages/xdisorg.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index db948a9318..50190863dc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -518,6 +518,7 @@ (define-public libxkbcommon (sha256 (base32 "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l")))) + (outputs '("out" "doc")) (build-system meson-build-system) (inputs (list libx11 @@ -531,13 +532,22 @@ (define-public libxkbcommon ;; wayland-scanner is required at build time. wayland)) (arguments - (list #:configure-flags - #~(list (string-append "-Dxkb-config-root=" - (search-input-directory - %build-inputs "share/X11/xkb")) - (string-append "-Dx-locale-root=" - (search-input-directory - %build-inputs "share/X11/locale"))))) + (list + #:configure-flags + #~(list (string-append "-Dxkb-config-root=" + (search-input-directory + %build-inputs "share/X11/xkb")) + (string-append "-Dx-locale-root=" + (search-input-directory + %build-inputs "share/X11/locale"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") (description "Xkbcommon is a library to handle keyboard descriptions,