From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id uIWMCMpdJGVkMAEAauVa8A:P1 (envelope-from ) for ; Mon, 09 Oct 2023 22:08:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uIWMCMpdJGVkMAEAauVa8A (envelope-from ) for ; Mon, 09 Oct 2023 22:08:42 +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 D85016FFB2 for ; Mon, 9 Oct 2023 22:08:41 +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=1696882121; 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=Vr+rXcdmlq0ypYpCdeXr+/jk7PNDoUaFulSiZOA/qgM=; b=ffnmdiDhfJ2vNzSODTo009poxQ0oalHwBcPyjB/zWkR1vaWgmKDycIlMedIvjQiH8sNFTG TMYfED9EGvUtohkF0VKVSjsv2t/5Qls8VCOUHa9N6HmNiXOXAKoRiNn3jOdjdUZGL8osWU yJFa9jDpc3/uyxC40zCgMv7W3MslPu1L/c2xVVxQXyHrt+xDspHeAZykHyv3V/O68EDcLj m7GGoqlrfW3lEtJA2REwyv1xiJf6OwaUeTPT/7lWf/pfeM0D3QlgSfTTJO2eJNob6d+5yn nuZ2Qsdk6aUnZIEJ5Flbub4M5nF7IWQ4r6+JWN+BbHBrhPano135Ya2tF3eSNg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696882121; a=rsa-sha256; cv=none; b=QKn5f0SwqS1+1vCiOWnKbjcGTYEqMIFcmccnonYzx3UGKnSOrKxMcaduxokbafjt3dSZOr M8opq3Lsv9TLgJpztyUMvryaEhBFSzxhU9W+2el4UgzoYjxsyuYVUYhAlEd8lGWINwextB nlTq+xRs7CMWpuqpu+EP4HYTUcq6IvhQEFf/Tae6Dk9rTkcfuNntjLeEh68OsgV4CWu5v7 ZkOhh/G7H9YVW95y4hpOz6xDwuqNfPlF07Wk9tW5OGWPyMJBDTwzOolIFzUPRVAkN2j+fW dCsxQ8zmrNy70egFP+4NvP6g9myAguNrDzCt3vCT3WUfuWwpl2qoq4YkR2qoEw== 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwXi-0005rm-Nb; Mon, 09 Oct 2023 16:07:54 -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 1qpwXf-0005qs-Sk for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07: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 1qpwXf-0007u6-KV for guix-patches@gnu.org; Mon, 09 Oct 2023 16:07:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwY0-0002Vk-CT for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 39/63] gnu: libxkbcommon: Faux propagate libxml2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:08:12 +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.16968820909602 (code B ref 65479); Mon, 09 Oct 2023 20:08:12 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:10 +0000 Received: from localhost ([127.0.0.1]:33310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXs-0002T3-Fd for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:09 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:39702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwXl-0002RE-Qr for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:07:58 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 532CF20E4C for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 9BF9A8009C; 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 di90dOhwzEai; 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 E3903800A0; Mon, 9 Oct 2023 22:07:30 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:27 +0100 Message-ID: <80880a332c5ad4ad635317249029367672206e98.1696881354.git.mirai@makinata.eu> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -4.71 X-Spam-Score: -4.71 X-Migadu-Queue-Id: D85016FFB2 X-TUID: wpMxxNoy4muC 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 50190863dc..5582bc8d7f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -547,7 +547,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)))))))) (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") (description "Xkbcommon is a library to handle keyboard descriptions, -- 2.41.0