From patchwork Sun Jun 4 12:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50595 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8914627BBE9; Sun, 4 Jun 2023 13:31:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1300627BBE2 for ; Sun, 4 Jun 2023 13:30:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5msI-0003iL-UD; Sun, 04 Jun 2023 08:30:23 -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 1q5ms0-0003ao-RH for guix-patches@gnu.org; Sun, 04 Jun 2023 08:30:10 -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 1q5mrz-0000dY-Ea for guix-patches@gnu.org; Sun, 04 Jun 2023 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5mrz-0007y2-A6 for guix-patches@gnu.org; Sun, 04 Jun 2023 08:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v2 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: Sun, 04 Jun 2023 12:30:03 +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.168588180030572 (code B ref 63854); Sun, 04 Jun 2023 12:30:03 +0000 Received: (at 63854) by debbugs.gnu.org; 4 Jun 2023 12:30:00 +0000 Received: from localhost ([127.0.0.1]:45274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5mrw-0007wu-3A for submit@debbugs.gnu.org; Sun, 04 Jun 2023 08:30:00 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:54750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5mrs-0007w9-K6 for 63854@debbugs.gnu.org; Sun, 04 Jun 2023 08:29:58 -0400 Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-65131e85be4so3656301b3a.1 for <63854@debbugs.gnu.org>; Sun, 04 Jun 2023 05:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685881791; x=1688473791; 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=2KlglBcUH4IV56P2ce7N/HTyHMxQaA/G/3UKQanagNQ=; b=a4jpSwm5XpJrT5D2T5fYxUb6bTyoXCBDqPF0jhPQ9V/XAJbmzrTXUhIlghX2WVH4zS 54liK/Q5NhJ6uf6olRHS40mZnOlQ6rKdLvuHvVKStabPczPfXfG7vGo5qY+Xq5MF5KfV xHWUQ76Xrj8gM3xC56e69RO1wFGpp+Sw7186hRjVWi98XYTQMh7PWPl/TIviS4GEwrEB vhKB6muPVDTvCPKaIzRnrNYb7w/1LUybYMZDeYkQWuWHfUnbE4cmydSLKsNEoyXExtB5 EeAzjxeVHT8gipsSdW/MsANRqmdIGJJEPRzIUPZAn9g5wkA6dH2HuMMm510/Hlbom+1M /8jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685881791; x=1688473791; 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=2KlglBcUH4IV56P2ce7N/HTyHMxQaA/G/3UKQanagNQ=; b=AvP/yJL5WTLyhTk+xAkrW8uVl4GUpwdDRfBpMRAwbxexdtx989H9kVZ3lL5L9Bbf4X sjGv7GZuYhPmuSP5ljO2gBKs8SZH7mYwh1876NxFho6N4wF6q8TG5WK9k2FHRRjLn9/+ wbAu4nMPtXF1q7Ok8gthdbu5AQhasS+vCzXr2K9Z5YWNn4Sn3rewCoUFtg54HEEe1iwg MnXIBe10M21GRFC+E2tB0HY/BKStXLkRyhoKHRF/cMLKGqAhcqqZkm1N3stq0ZhpBaBY x47x+unpkiVjZHpQuUplpoENwPQ7RFBHD4wZQuEdUgZr9nB3URY3KPE4o2hkkp4Dp5Qh nL3A== X-Gm-Message-State: AC+VfDzH9mczJvfOpcnfJ9Ur0LZ8KPJufi8ZwFArpNfLv8EaD/46os2j 0tFrlqArT36NX2X17e8AYAbwKqsJaG4Iqg== X-Google-Smtp-Source: ACHHUZ5ooXAhwlmr0AOlEhe8YohCYzIoeiHrTnncm0mTRn5DylPWlMgt/LRJj0zDiZhPA2e++7nYzA== X-Received: by 2002:a05:6a20:7f87:b0:10b:5ce1:beb9 with SMTP id d7-20020a056a207f8700b0010b5ce1beb9mr4776668pzj.33.1685881790835; Sun, 04 Jun 2023 05:29:50 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id b13-20020a65668d000000b0051baf3f1b3esm3738984pgw.76.2023.06.04.05.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 05:29:50 -0700 (PDT) From: gemmaro Date: Sun, 4 Jun 2023 21:28:04 +0900 Message-Id: <72b82f75a3f87474a3eb40486fd01db09ee97ebd.1685879572.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xml.scm (libxml2)[native-search-paths]: Add SGML_CATALOG_FILES. (opensp)[native-search-paths]: Remove SGML_CATALOG_FILES. --- gnu/packages/xml.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8d9974b825c..c19e7125647 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 @@ -1743,7 +1754,7 @@ (define-public opensp (native-inputs (list docbook-xml-4.1.2 docbook-xsl - libxml2 ;for XML_CATALOG_DIR + libxml2 ;for XML_CATALOG_FILES and SGML_CATALOG_FILES xmlto ;; Dependencies to regenerate the 'configure' script. autoconf @@ -1781,14 +1792,6 @@ (define-public opensp (("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\") "\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`") (("^\t\\$\\(SHELL\\)\n") ""))))))) - ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found - ;; under the 'sgml' sub-directory of any given package. - (native-search-paths (list (search-path-specification - (variable "SGML_CATALOG_FILES") - (separator ":") - (files '("sgml")) - (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") - (file-type 'regular)))) (home-page "https://openjade.sourceforge.net/") (synopsis "Suite of SGML/XML processing tools") (description "OpenSP is an object-oriented toolkit for SGML parsing and