From patchwork Mon Jun 19 23:47:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 1581 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 5388627BBEA; Tue, 20 Jun 2023 01:03:31 +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 autolearn=ham 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 8AAC627BBE2 for ; Tue, 20 Jun 2023 01:03:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBOps-0005Cu-SP; 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 1qBOpq-0005CI-R3 for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:02 -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-00073D-IR for guix-patches@gnu.org; Mon, 19 Jun 2023 20:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBOpq-0000ic-EF 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 0/2] gnu: po4a: Fix SGML tests. References: <787df376b4ca9aaf15b8eda7c04ee7ae984d78e9.1685728331.git.gemmaro.dev@gmail.com> In-Reply-To: <787df376b4ca9aaf15b8eda7c04ee7ae984d78e9.1685728331.git.gemmaro.dev@gmail.com> 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.16872193722726 (code B ref 63854); Tue, 20 Jun 2023 00:03:02 +0000 Received: (at 63854) by debbugs.gnu.org; 20 Jun 2023 00:02:52 +0000 Received: from localhost ([127.0.0.1]:57579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpf-0000hu-K4 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:51 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:54307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBOpc-0000hR-Ku for 63854@debbugs.gnu.org; Mon, 19 Jun 2023 20:02:49 -0400 Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-54fb1bbc3f2so3178472a12.0 for <63854@debbugs.gnu.org>; Mon, 19 Jun 2023 17:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687219363; x=1689811363; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FhqR2syj6RG2BxFTWnPPvOWVGC3LDgHjerWj00fXcjc=; b=ni3RY2e8FfgaeZ6ZKgMxt6EpRAM2ZT8CdlJDeOabIRS2VQu0VcPgspcD3VkOFHyWfH H9ypn2UgMGqV7xvXvv4+yr8jDDpKpaOeFHKirgp3y+Im1B0IE4/mWfKSilB5IXdlS5A1 OhEJ0L0/6Cl+1txLIGSyhh0x1xZo2AuQRnS6Nz6KTa+JUXodh0uBpjfwXkEe74EWZPrG vKVrxY9XJYhYpiGsKx2DgMUhW8RHwkYkNo4+zvVaCB/UPg7JrdRJUJlSpKuPpYf/J+Fv NmsXPKjwuyTGKiJg0hDO/uh5o838qU7jkmxFMy5spDCqVy3ISbZQSnue5zJSx/dit2MP w+aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687219363; x=1689811363; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FhqR2syj6RG2BxFTWnPPvOWVGC3LDgHjerWj00fXcjc=; b=SEswTx6O1SxHIeoq7fzhk1WRlEZ5oQ5Kmyud/bDYVbCVzUEP/9nY9vNkeYfkk9n/E8 O8txhKSU0UCBanxlwKf0bnn9uCyk06kvHNGISQ6Wy2nq3Ut4MSnjBW/+9Ti0auFxDY8m Jh3eHhF6I62buMFMCTGSmVCzWJqeoCTXhCYX5CG8Sd2mZUSkIgi8oZlMRIUeSQYMGNzo BjvjC+IdApU7LqUGfbj3I540uyPE/xvQqqMVuEkLijJAjK52YqMIbKyWVd3/7YfXKx39 t2BuA4Dl/g8eYnpwiypmGe22dC2ol1gCmI103M3TzS0jyWRZdu+y65disl86W5jYIjza W2bw== X-Gm-Message-State: AC+VfDypOv+6c4mitKi9UnPK6wmwFHd8XLm0GRC3Qsy6eHCUFo75ZLKc FhQlxfLlXkB3VdIQsW7dgTz5wp0Ji4/6mw== X-Google-Smtp-Source: ACHHUZ67CnDVWDwicbGLp3lDPfIlzUHCUxpIhtaaR6haEBBDpFpQIGUduY0hEFesXCayxW6PYeOBAA== X-Received: by 2002:a17:902:7c02:b0:1b6:69dc:44d2 with SMTP id x2-20020a1709027c0200b001b669dc44d2mr2634015pll.51.1687219362246; Mon, 19 Jun 2023 17:02:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:02:41 -0700 (PDT) From: gemmaro Date: Tue, 20 Jun 2023 08:47:45 +0900 Message-Id: X-Mailer: git-send-email 2.40.1 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 Hello Bruno, Bruno Victal writes: >> @@ -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)))) > > Interesting, looking at opensp it seems that it also makes use of the > SGML_CATALOG_FILES environment variable so I don't think it shouldn't > be removed though I don't know if it's valid for more than one package > to share the same native-search-path. You are right. Looking at other packages, there are some native-search-paths defined with the same name, such as C_INCLUDE_PATH. One solution to avoid duplication is to define it globally, like $SSL_CERT_DIR in guix/search-paths.scm, but maybe not go that far this time. I stopped changing opensp. Best, gemmaro. gemmaro (2): gnu: libxml2: Add SGML_CATALOG_FILES to native-search-path. gnu: po4a: Fix SGML tests. gnu/packages/gettext.scm | 12 +++++------- gnu/packages/xml.scm | 27 +++++++++++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) base-commit: d884fc9e2efecfba09af4694f5a13ad7fc6f704f