From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SIieJ73skGQ0AQAASxT56A (envelope-from ) for ; Tue, 20 Jun 2023 02:03:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qAaxJ73skGSGkwAAauVa8A (envelope-from ) for ; Tue, 20 Jun 2023 02:03:09 +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 E6E5A3FBD0 for ; Tue, 20 Jun 2023 02:03:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBOps-0005Ch-NC; Mon, 19 Jun 2023 20:03:04 -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 1qBOpr-0005CQ-8P for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBOpq-00073L-WF for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBOpq-0000ij-RL for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v3 1/2] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 00:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63854@debbugs.gnu.org Cc: gemmaro Received: via spool by 63854-submit@debbugs.gnu.org id=B63854.16872193762743 (code B ref 63854); Tue, 20 Jun 2023 00:03:02 +0000 Received: (at 63854) by debbugs.gnu.org; 20 Jun 2023 00:02:56 +0000 Received: from localhost ([127.0.0.1]:57582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpk-0000iA-0b for submit@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:56 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:48401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpd-0000hW-OE for 63854@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:50 -0400 Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-51b4ef5378bso3346567a12.1 for <63854@debbugs.gnu.org>; Mon, 19 Jun 2023 17:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687219364; x=1689811364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aVeGJ5XiCuC1kO2IiGHO09SPlVGdoxhBnv8eilRDdPA=; b=qXSc3bcFP0SkPwJVdYHYJ6BV2rrFJoNaF/B4UzurpRbnAF9kUWeABWJCzxbX3HNemd EU60QGmn+7GUQl/4shp0zwJkrxHfcUvAYxnYXqEFFRe6Z4qbVgr6Wem4ff56OKzl7GSh CZUvlHD1a5UO1vfipDH59Zu/ddSjGKrCPj4eVnocjCOuam+eDTodVzc3oOncWnujc51f +U0+xiTa5io710emzB+02laNdoSr807Oix93xjuMM5e7WYsQStKfn6JGBqNSmhbORaPP 0lPq0VGCZLoTvwKUd8F3EDADFNgewRUwwUgYYqJqrJH9g7DIMEo491JY1WEbwCSZcxb/ iLJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687219364; x=1689811364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aVeGJ5XiCuC1kO2IiGHO09SPlVGdoxhBnv8eilRDdPA=; b=NT0ZkNT4U075zgMVftXKwfXEs6DoL6c6Px1n4LFo38j35lgjWj0TjEHFl24gEfyzhe cf5FRICArC9nB6GjP8jWPLpPJhk6p9QH57yGjLjhaxis6+M2d8QhekxCqSWQ6LzljHLg tj5AVbAivFXqcCd73RmHtTkhI69p/TlQH+ul9nWbHycOoclbT2dM5E6LJhu5/CxQOhnD WaMJaLWp3c3bJM7eLDvSB2KOu5hhKw2RFkZiWfR0PjKDb7z8yvo9aXInY3y5jdd3mPq6 WZTp/d0jq2/Awfp/MZb+OrHPLPxPNc15Q/Ep+nCpXhRlvK99D4SHj09lFWiiriPF1Zd9 wgpA== X-Gm-Message-State: AC+VfDw/tZeUKuAT1qc9T8LsdMjr2Co1BTSk/fPIak+EQB+50ky+q0lP vNk+IUeZY2OpmrwhTGw66gDDyOwMdhnHSg== X-Google-Smtp-Source: ACHHUZ4RyNW8ae2wa7PEq/TZrf+vlLJzjGp+86ufC858L5qw8RFt7E/Rcb/TliCHpvZlE1nSLJoM2Q== X-Received: by 2002:a05:6a20:8e03:b0:121:3f8:2889 with SMTP id y3-20020a056a208e0300b0012103f82889mr8633663pzj.23.1687219363959; Mon, 19 Jun 2023 17:02:43 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id m14-20020a170902db0e00b001b3d6c86ffdsm337317plx.156.2023.06.19.17.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:02:43 -0700 (PDT) From: gemmaro Date: Tue, 20 Jun 2023 08:47:46 +0900 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687219389; a=rsa-sha256; cv=none; b=YoPw1P6xnTfGmYNsDgPMYfEiYlwJ5stv3uxf/IurS6AhCtWdiz6tw8pfEw1ZUkcrTn5E70 Fz2y+HxOfAK0j+dL/pZcHc+n4YeRGa+E/h0cLsja9nO4/IvG+33HnepC9hqIB0OLlSNNz0 2rhYR6P9kHJ2BEF2n3gtSZjTYbTwEu0Yj/Sj3tlt/r+veo1q32R+iqqESoqYNfOQOx0PLb XFs2bt//Vrah4BCfqifgKaa0+07nRFZT9sqzJoKEgBqCNQE7plpz09sA7p5jfXZ9WTkRDs bvGSbrjNuvmuppaYA3Im7OsSm/Gtr1vzyBtBBimtCUxO8Jh4kziXeDiN1kJMQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qXSc3bcF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1687219389; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=aVeGJ5XiCuC1kO2IiGHO09SPlVGdoxhBnv8eilRDdPA=; b=DQum/cJPIAW0GGbjX9rw0qHCU6RYyM0bJk1EMLxlRV+UwWEE1EEeKwfODf2egrco7LIJlH SD58Itbfmkhys8WYHv8cJi0EebsZmrUqJeAX4yYG6QioX8/jaf8t6bByY3XZCOzbqCGFUe ID+FB/XtLoE/C7GKUPIpV6U1GrWhV17yMm5Ep/2ZZ3CLolQIoQJ7WgDgmuVR0q5Ln9HhLP eJQzYvkbPGC+doF9PN/Dr0PDHfB1V8w2GjYB7apMmUKaty9dygK/eF6y8Dk13oyxuwylPV xCSZjqcnHnJ5Qw0fRb++gzgNwi7E0o1ql5DqBNZ9VCx1HIdiHPpGF39Gp7uLuA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qXSc3bcF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.64 X-Spam-Score: -0.64 X-Migadu-Queue-Id: E6E5A3FBD0 X-TUID: lUi9ovS4mc8u * gnu/packages/xml.scm (libxml2)[native-search-paths]: Add SGML_CATALOG_FILES. --- gnu/packages/xml.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d9974b825c..e376f0f09b2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,14 +223,24 @@ (define-public libxml2 (inputs (list xz)) (propagated-inputs (list zlib)) ; libxml2.la says '-lz'. (native-inputs (list perl)) - ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' - ;; sub-directory of any given package. - (native-search-paths (list (search-path-specification - (variable "XML_CATALOG_FILES") - (separator " ") - (files '("xml")) - (file-pattern "^catalog\\.xml$") - (file-type 'regular)))) + (native-search-paths + (list + ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' + ;; sub-directory of any given package. + (search-path-specification + (variable "XML_CATALOG_FILES") + (separator " ") + (files '("xml")) + (file-pattern "^catalog\\.xml$") + (file-type 'regular)) + ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found + ;; under the 'sgml' sub-directory of any given package. + (search-path-specification + (variable "SGML_CATALOG_FILES") + (separator ":") + (files '("sgml")) + (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") + (file-type 'regular)))) (search-paths native-search-paths) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome -- 2.40.1