From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GIArCkVeJGWAjQAAauVa8A:P1 (envelope-from ) for ; Mon, 09 Oct 2023 22:10:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GIArCkVeJGWAjQAAauVa8A (envelope-from ) for ; Mon, 09 Oct 2023 22:10:45 +0200 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 E4FE55A965 for ; Mon, 9 Oct 2023 22:10:44 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696882244; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Zufs9db6f8tLlSgA1+XtjBNOnx7R9EgokhzIq2M2Zms=; b=m/0r0BqxFZ77ugrRw4D//dpGiOQH8JCHWXJEaM5BKDLgzPywXcsT+pzohEWc/HtqWO3r50 1qCwjvhumOElGaQyJUQvVrmfTrQKNQul0RHQJZJWJQEwQFF+cGjY+llL2HkjojYqH8/TxQ 1xXTBeEqOjvFmL8ZS5jLQp3qtPSK5aGGIdlRi+3mQT9BqauzsvAGs8GwWgjDXnJ3w0OQyF FdwCcX9staDWLqdnH0/wgzLF4TYRiJIY/rpXeUTLWxJr2nQQW2tUYRgNR3RwfIZI89EA5p 1ucPHf9MuQprYfqvGmAOk+/hVAPySclFhWalNU2x1L/+qK2lCG+EKUq+E9BmiQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696882244; a=rsa-sha256; cv=none; b=AQsv8DDYgrGbVi8tyEFkI1nDRU8Fpz2rj2qjqhtkbEqn7b4A1Pa2HTL9FzaUqwiaYdrIkL 5ygJNVyTsZ3sJD3SoznSxvne3djl8xr40CacDcQt9qP9uQRwsB++KpRmj05WTOGfaGzWdO 4yC9toI/X1Sm2ShuKkyPStJQRUJnFA0UxZW5FstrgmrIz6sWsl/iNvdI+wpgC4Ukv6FPj5 caKC6Tv+uvekH9Ya6LC/MWiHHjgtKOPYM9q3J1/CH9/8LTo49V5LPEvfsp0bPlHBQZ2bOs 5EG9rawuP3kA1dnVexzpAHE+Y6qws0l8rETr4d7fyuvYCBbF5202lIhoSoq52w== 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 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: E4FE55A965 X-Spam-Score: -4.73 X-Migadu-Spam-Score: -4.73 X-Migadu-Scanner: mx1.migadu.com X-TUID: srAggIQpJTFm * 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, -- 2.41.0