From patchwork Sat Jul 22 14:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51925 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 B55AF27BBE9; Sat, 22 Jul 2023 15:58:11 +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 7AAF227BBE2 for ; Sat, 22 Jul 2023 15:58:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNE3Y-0001x0-3R; Sat, 22 Jul 2023 10:58: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 1qNE3X-0001w6-27 for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:03 -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 1qNE3W-0007bE-Ec for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNE3W-00012V-Ah for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v4 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: Sat, 22 Jul 2023 14:58: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.16900378263920 (code B ref 63854); Sat, 22 Jul 2023 14:58:02 +0000 Received: (at 63854) by debbugs.gnu.org; 22 Jul 2023 14:57:06 +0000 Received: from localhost ([127.0.0.1]:37445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNE2c-000119-6k for submit@debbugs.gnu.org; Sat, 22 Jul 2023 10:57:06 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:55466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNE2Y-00010I-Ec for 63854@debbugs.gnu.org; Sat, 22 Jul 2023 10:57:03 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-55b83ae9be2so1970682a12.2 for <63854@debbugs.gnu.org>; Sat, 22 Jul 2023 07:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690037816; x=1690642616; 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=GIwZT39PEviQOuUWkIj20xkjV65f7XE8TIPCusr9sHI=; b=BGTj89ahY146LiYuFtFUMfM43mVroJUAan8JQM/I52io4TF4XpS5w1Nnu1BememdyB Ge3Y9o/AvhIBKdycvWhsH8p7ij9tsvU+nxXscbi/3/6Es08v9LX0Nloozuo7MzUpt2Mf Aeq8sdngYK50Vz+v5yfqog4vzayJ9GxG4nGGBTCa3XufVN5i0UVS7Z73HU0UnFokDtIw LqSpjfrSQ7LiuVRkDo7sfxeGXgtQf+HvAf8HTOfmXyKFmQi+7UPPbuFnJhDU6p0WuXdR Xf1C5OdZe1m06DsMT74g/RW2IHlTE4ZKowsibnXWYgNbKrIJBVxgmxWBR1dnBmVstFw4 kQFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690037816; x=1690642616; 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=GIwZT39PEviQOuUWkIj20xkjV65f7XE8TIPCusr9sHI=; b=I0auE4kehk+EG62oBbSQCSJchkm9K7+HumpO2bYdPZRWJq4f8WKsFNLXTdH+IYaz65 +MTO1bvLigbpJzazD+bwyktEPCUTCiYTOiklub9A3BEyR52as+LpKy+6dsHqUF3lGRkW InEzioGrCwvcZoG9axhNaqBhFUIywpebfbsx9e1vTzrmM1AQEgzljqwfz/qhx5Wkw2gh 62XhFtyoCixEZbVAmjDFNk4clL4Vjz+gBF5jlwvHtPGNtRdSPZwaVTrNthD1HzCTrQ77 sZaBdGi1NCksiL76BL5mLXc7vlVTN12nc03y4HoI8BPYBqCfasoPCu2x+1bldLLrXbj+ zvHA== X-Gm-Message-State: ABy/qLYBlaT5vH6CRvH9maq+dqjhclWel0wsPaHOL3+1QBpwxFWl+GVS RHHsZ5NDjJkHoP4Om7P6XZNHDqCzbVPX5g== X-Google-Smtp-Source: APBJJlG93djYKBp6ucoSIdKQ7/RQ1PO+ykxQeErsR9bLG2jVbbcwLynII03X9pdx3YgQjx11CDzMsQ== X-Received: by 2002:a17:90a:3841:b0:256:d4a:ea4c with SMTP id l1-20020a17090a384100b002560d4aea4cmr4510711pjf.30.1690037816281; Sat, 22 Jul 2023 07:56:56 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a019800b00265892de629sm4354203pjc.29.2023.07.22.07.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 07:56:55 -0700 (PDT) From: gemmaro Date: Sat, 22 Jul 2023 23:56:19 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 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. --- 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 555f0ab624..712af965d8 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 From patchwork Sat Jul 22 14:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51926 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 1ED8C27BBE9; Sat, 22 Jul 2023 15:58:37 +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=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 1DF6D27BBE2 for ; Sat, 22 Jul 2023 15:58:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNE3Z-0001xT-NH; Sat, 22 Jul 2023 10:58:05 -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 1qNE3X-0001wZ-54 for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:03 -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 1qNE3W-0007bL-St for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNE3W-00012c-P5 for guix-patches@gnu.org; Sat, 22 Jul 2023 10:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63854] [PATCH core-updates v4 2/2] gnu: po4a: Enable SGML format. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 14:58: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.16900378293929 (code B ref 63854); Sat, 22 Jul 2023 14:58:02 +0000 Received: (at 63854) by debbugs.gnu.org; 22 Jul 2023 14:57:09 +0000 Received: from localhost ([127.0.0.1]:37447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNE2c-00011B-Ju for submit@debbugs.gnu.org; Sat, 22 Jul 2023 10:57:09 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:55780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNE2Z-00010L-N5 for 63854@debbugs.gnu.org; Sat, 22 Jul 2023 10:57:04 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-55b1238a013so1968359a12.3 for <63854@debbugs.gnu.org>; Sat, 22 Jul 2023 07:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690037818; x=1690642618; 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=volH2pdZo8B9t62c70klITuabMYSpvnEf4OA6G+wynY=; b=lfdD8taeiMTNmTfpBxlcg9WYAvyKk0uEGKciPoUIZW6YNqKCsPTP3uYkll8b/HEzhD +3FAGaeV5vyHtDFwu+RS/D2RfWRCXremiKtApf89xUtmhFHSNx0HVhYKem462P/By2Bt XYcx2XxNBfoAXBkLJXjPPM7zLlYAOLTX4TqS//q4yryB8kcIZhNzh/67eyegy0jGHV2j u9xxT2lwQJBXzkNQOW0rPtIq9ITNsZR4e5Mad5UG9O7/QIe1qi7rIKa2wmdEGgz3YOZu bADMvSg9beoH5rZ9530brmyC7RQbuFKqjNhSMHVzbgv0ER4hO2FKoEKCm1+6dPM15QQj ECnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690037818; x=1690642618; 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=volH2pdZo8B9t62c70klITuabMYSpvnEf4OA6G+wynY=; b=XJLxOraQeEKz+ppn7LY5uF1qEfH1IU3tSUxgSl6EqzWxgSVRUU8/E9ZdXVmKA+W4L2 ZaKX0PaklHpD/Jf+kQi1usKSVHtEhrKqfN7rlg3QAGUcQhGMghk55Al8OKUoRaxh+t+H 8rADQcF7xoXwdao6IknDmWCw4uqVlU533y4MNXQDou+lpWATzL4CNI0qRZSiubJnGfDa QsfBt/y6B1iZ1HHwtZkSPw8it3mtbAc8X6kp/DMNwZGX2Vi33zjv4XlJH5y5LJSS1MNy dwcZ3H4MY1vNozJDCKOj4Kw/YNltHp0SHX4vc34Z3JuJwm//g+jhLvHTKJNg4thHhPtO O0Sg== X-Gm-Message-State: ABy/qLYxOdzyLH2YN6NYt87jCEmlgEqsX40kylOlgePW83XvyXyftyoY 8o3+JJT6gl4PyvWbYd/341K0I81+WR5z/Q== X-Google-Smtp-Source: APBJJlGKegAvv/YHYc5p/Wy+WnQ002rorwLPKgflIlImTlBXEiX2nF4fw0DrlEDL03sEYB8EGMrsvQ== X-Received: by 2002:a17:90b:78c:b0:263:5d42:79f7 with SMTP id l12-20020a17090b078c00b002635d4279f7mr5084635pjz.23.1690037818102; Sat, 22 Jul 2023 07:56:58 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 24-20020a17090a019800b00265892de629sm4354203pjc.29.2023.07.22.07.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 07:56:57 -0700 (PDT) From: gemmaro Date: Sat, 22 Jul 2023 23:56:20 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 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/gettext.scm (po4a): Enable SGML format. [arguments]: Remove disable-failing-tests phase. [native-inputs]: Add docbook-sgml-4.1. [inputs]: Add opensp. --- gnu/packages/gettext.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index b3dd844147..ca52f912e7 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019 Miguel ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 EuAndreh -;;; Copyright © 2022 gemmaro +;;; Copyright © 2022, 2023 gemmaro ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -276,10 +276,6 @@ (define-public po4a (wrap-program file `("PERL5LIB" ":" prefix (,path)))) (find-files bin "\\.*$"))))) - (add-before 'check 'disable-failing-tests - (lambda _ - ;; FIXME: fails despite of importing SGMLS - (delete-file "t/fmt-sgml.t"))) #$@(if (system-hurd?) #~((add-after 'unpack 'skip-tests/hurd (lambda _ @@ -291,14 +287,16 @@ (define-public po4a (list gettext-minimal perl-module-build docbook-xsl - libxml2 + libxml2 ;for SGML_CATALOG_FILES libxslt ;; For tests. + docbook-sgml-4.1 docbook-xml-4.1.2 perl-test-pod (texlive-updmap.cfg))) (inputs (list bash-minimal + opensp perl-gettext perl-pod-parser perl-sgmls