all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: gemmaro <gemmaro.dev@gmail.com>
To: 63854@debbugs.gnu.org
Cc: gemmaro <gemmaro.dev@gmail.com>
Subject: [bug#63854] [PATCH core-updates v3 1/2] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path.
Date: Tue, 20 Jun 2023 08:47:46 +0900	[thread overview]
Message-ID: <a1c2e8847ce91e0462ba908ba65a2cd97b7b2e79.1687217685.git.gemmaro.dev@gmail.com> (raw)
In-Reply-To: <cover.1687217685.git.gemmaro.dev@gmail.com>

* 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 <glv@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; 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





  reply	other threads:[~2023-06-20  0:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02 17:52 [bug#63854] [PATCH] gnu: po4a: Fix SGML tests gemmaro
2023-06-03 22:12 ` Bruno Victal
2023-06-04 12:28 ` [bug#63854] [PATCH core-updates v2 0/2] " gemmaro
2023-06-04 12:28   ` [bug#63854] [PATCH core-updates v2 1/2] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path gemmaro
2023-06-08 18:46     ` Bruno Victal
2023-09-06 14:05       ` [bug#63854] [PATCH] gnu: po4a: Fix SGML tests Maxim Cournoyer
2023-09-06 14:28         ` Bruno Victal
2023-09-06 18:44           ` Maxim Cournoyer
2023-06-04 12:28   ` [bug#63854] [PATCH core-updates v2 2/2] " gemmaro
2023-06-19 23:47 ` [bug#63854] [PATCH core-updates v3 0/2] " gemmaro
2023-06-19 23:47   ` gemmaro [this message]
2023-06-19 23:47   ` [bug#63854] [PATCH core-updates v3 2/2] " gemmaro
2023-07-22 14:56 ` [bug#63854] [PATCH core-updates v4 0/2] gnu: po4a: Enable SGML format gemmaro
2023-07-22 14:56   ` [bug#63854] [PATCH core-updates v4 1/2] gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path gemmaro
2023-07-22 14:56   ` [bug#63854] [PATCH core-updates v4 2/2] gnu: po4a: Enable SGML format gemmaro
2023-10-09 22:20 ` [bug#63854] [PATCH v5] " Bruno Victal
2023-10-11  1:52   ` bug#63854: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a1c2e8847ce91e0462ba908ba65a2cd97b7b2e79.1687217685.git.gemmaro.dev@gmail.com \
    --to=gemmaro.dev@gmail.com \
    --cc=63854@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.