From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 GOLLOfOK5mRr1AAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:40:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id kFzkOPOK5mTG4AAAG6o9tA (envelope-from ) for ; Thu, 24 Aug 2023 00:40:51 +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 B6EB24CF38 for ; Thu, 24 Aug 2023 00:40:51 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830451; 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=WSwh8Rcxk3RC9QDFAlTfjCWjKemNYxK3D6Ogr5x5yXY=; b=BlYIYRlUBMwg+qr4QkfROl2AxXosCfTa9ezNYwpSMDHRP5lNqw0P99O6hvluCtXGavrNNv qInhQBtPtpcLFDMStMFPKJDScPFFMUrhtr4G6qFwMxE9PMuOSMuEqvFQAxMkN8B53YjBJR S12+W8gXvUdjEKZMcD5RmOj3/HvKkmnlDzhqZ52oAJDN9enHHvRqeFftApf5DuY3vJ6Gmx h+CGZXjHMEB+F8kqUBtFsCyxdB8cviFetWndEgy9xGmZJCMbZ1BiKBmQvVg/Na8TgwYO4K FaB15dBCkCE5/w08cIiqOawU0T46AJbJu+siob0qFpqXMt4+6bjFgXBD78H1kw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830451; a=rsa-sha256; cv=none; b=kA9dlaw+5nLpjXg/ruM4fbLL1+e/aYV2mbv86tIra0zr6UPM/B2lA4e+4UuwknWZIlw8Rg Z2x40JHid0TvbOzzR4TYMLke7vfPnzWHudUwnyHYJJ1yz83VzuEn4HKm+DXjWaT4v6DCr9 VwTqwGu8r9zv3k1d1GgjwkZVSQYCm1NevMYmB2z/OMjmI4q8PXCx1zK49zvy/fVUrLmXL1 pykyLcwGaWlg2uNPmkMGmmYA5+0WqzMU77bQgPGklcfTHcjS+jNIjlo2e/47tAKVw/Ee9G Fu2F+Z5VUYMN3ps86FAV3E7pviUQLFoVzgOQLfWGNVs6i1hzUTNNaaFKsbkz3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTZ-0008MZ-45; Wed, 23 Aug 2023 18:37:21 -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 1qYwTL-0007pm-Rl for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:09 -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 1qYwTK-0004x0-UZ for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTO-0004CP-Hy for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 38/61] gnu: libxkbcommon: Faux propagate libxml2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:10 +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.169283021615848 (code B ref 65479); Wed, 23 Aug 2023 22:37:10 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:56 +0000 Received: from localhost ([127.0.0.1]:35387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTA-00047R-2A for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:56 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:43730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSk-00043V-RJ for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:31 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id A76672094E for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id ECB58800B0; Thu, 24 Aug 2023 00:36:22 +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 2T9kyEh35ndg; Thu, 24 Aug 2023 00:36:22 +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 7D3848009B; Thu, 24 Aug 2023 00:36:17 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:30 +0100 Message-Id: <2eebd497a8959b0abaa2e8805fde263edf2b58fd.1692830150.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.71 X-Spam-Score: -4.71 X-Migadu-Queue-Id: B6EB24CF38 X-Migadu-Scanner: mx1.migadu.com X-TUID: mPy128uD5J7A xkbregistry.pc lists libxml2 as a requirement. Use a symlink for the libxml-2.0.pc to avoid setting libxml2 as a propagated-input. * gnu/packages/xdisorg.scm (libxkbcommon)[arguments]<#:phases>: Add symlink-pc. --- gnu/packages/xdisorg.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 501a55c9cf..05b6d2dc76 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -539,7 +539,15 @@ (define-public libxkbcommon (let ((old (string-append #$output "/share/doc")) (new (string-append #$output:doc "/share/doc"))) (mkdir-p (dirname new)) - (rename-file old new))))))) + (rename-file old new)))) + (add-after 'install 'symlink-pc + ;; in Requires.private of xkbregistry.pc + ;; XXX: Symlink libxml-2.0.pc in order to avoid putting + ;; libxml2 as a propagated input. + (lambda _ + (let ((stem "/lib/pkgconfig/libxml-2.0.pc")) + (symlink (string-append #$(this-package-input "libxml2") stem) + (string-append #$output stem)))))))) (outputs '("out" "doc")) (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") -- 2.40.1