From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 WEpeMQ0FD2XMcgEA9RJhRA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 17:32:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WEpeMQ0FD2XMcgEA9RJhRA (envelope-from ) for ; Sat, 23 Sep 2023 17:32:29 +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 8413934234 for ; Sat, 23 Sep 2023 17:32:29 +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=1695483149; 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=ueiCVguD16WDbuvM+VPfO/OXyEN1knOLPfzqsqWwsX4=; b=l4muI0u2dFxQUUUSjNQbl6iYv7KpDAM8TI8leaEBdKU+sUPyl18mgHF4nliNWoY9IvjWU4 OIm17Wzb78g6vn56IilMx/a2k8n5ztVCTt/IU4/bFO2ub+AhvXWe+17t562mOmiL+D+vLe UYNYT/wMYkqjYd81l2QEzmygnyM5ncD5x/v4MwA3QtcpHrR2moSzRvrQO7ZBd4qGkAIvkZ hYClRtxWYEhYKCA1A8VUmcXxNa0U+sKl23JJLycpTIvMS3NFukmDJZypggh63JdiTrRj42 HpcEy3BlwwhLi+R14GcFjZcsPdYnoy3H2hjFAXdTEIqrtAZl+hzrNIFdV4q+iQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695483149; a=rsa-sha256; cv=none; b=JhdjtK8xHGOM5OwESTpyra+/3eW7YCE+4iUqaS2j20aADmiKpRrpSK7LKRi5S3YVSpsvvs uNMUHPnTngHr8Ko8Za1rfWw/jqxJkYuwvIwblFZb4rED8EXXjw8gEq7JFqdCj9e9gevSpm E71aYWgPN1E5gRC31weAq/fYwHQO5dRGFMGcqpI9cwaNMfI15198jyD/9syMcPgFQv6s6w tb4sv/R0sUEcz4CxgVkNwDxp3AST4BdLOitOHJA4Lw0xYZzpx5yw4qPCUqYceYJG4iZvJv COdCyoS2KkJjZ5+S9KX7F5r2t9La6mQPs8UF5Vh5DpIQIGbf7q+KVJRQp6hQ1Q== 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 1qk4br-0003vL-Lr; Sat, 23 Sep 2023 11:31:55 -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 1qk4bo-0003tx-S3 for guix-patches@gnu.org; Sat, 23 Sep 2023 11:31:53 -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 1qk4bo-0000mh-3b for guix-patches@gnu.org; Sat, 23 Sep 2023 11:31:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4bz-0004Dh-Ab for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 38/62] gnu: libxkbcommon: Faux propagate libxml2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:32:03 +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.169548312116191 (code B ref 65479); Sat, 23 Sep 2023 15:32:03 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:32:01 +0000 Received: from localhost ([127.0.0.1]:40339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4bw-0004D0-Pk for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:01 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:42772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4bu-0004Cp-RU for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:31:59 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 8251C20CFF for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DCCE780092; Sat, 23 Sep 2023 17:31:42 +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 IlbB05bHpyyd; Sat, 23 Sep 2023 17:31:42 +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 5838780098; Sat, 23 Sep 2023 17:31:41 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:13 +0100 Message-ID: <3378803d7b33e5ca657315dcc41193560ecc5a68.1695478390.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.74 X-Spam-Score: -4.74 X-Migadu-Queue-Id: 8413934234 X-TUID: ImHntqYsL5j9 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 adc8260943..9144d3c501 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -546,7 +546,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.41.0