From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OHkBArsvH2UL0AAAG6o9tA:P1 (envelope-from ) for ; Thu, 05 Oct 2023 23:50:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OHkBArsvH2UL0AAAG6o9tA (envelope-from ) for ; Thu, 05 Oct 2023 23:50:51 +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 C890E41514 for ; Thu, 5 Oct 2023 23:50:50 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bE7pW0Uj; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696542650; 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: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=3y5PS6eb/z70jHXZCIKHYcEsd2gudbE1mdql+jbPnYU=; b=FXUA29Zm5gKWlzKgSerxQ4L/rqlr3gDwpQ4980wWWiYouX3IpyUDfpgXhlAf7hTvlkzLUB VE1VHQZFDAy+a22msVn36NGCdhfz/Bg8LTJx8nP3L78T6J72cmGIcVqdMCkk3g9FTSEseY L8noTDjKtmF/JtMagmSxqF8+sRu0/wyCI0DNYVqrjXOgz4Bptuvi2jNPXFbW00pA7Nc60r tOAEG6vD96Ac+RekxPbHSWql1Uui9qm8BWD1nL1EYU9xHsz32TGKZYMIMu3XY1XAp19cEe sdPrRFTvyViS9MFS3QiC/kZogd6SPJVQ60wUc9yzusYZdI7yOAwqioO2mex9Ng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bE7pW0Uj; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696542650; a=rsa-sha256; cv=none; b=sXe4tiKPRGVHFvDnAOKbv7ysGohI3pQiQiQQk/tGdbP/9HwGmHJl3ixoqU86pk+P0V5eRW cdDdh9jD68ibsXBK8F2Cj1C3LXE6acUxUZ7LBwEaNoLOaC7u2k3PHcUfvkDWB3rNZXxAUM 5/V2YhnrreWZyK+OVCsLjcI34413WdCCJybZ1AC8kHCS8vDAE7r2V+PhsInoAOsQNk6XTw 6hEuLc/u/qacX2C0qUHadUF5KrVZR1ADTNht9DuMa4cPTnxYv/5EJsGvFkQf7A7XWOJpx1 I2gcDCo3tmfBum7/CeIfLmGM0UKqBneLZCkgTHq3whGwWVyMpyIklyYZphnObw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoWF3-0006Wk-BY; Thu, 05 Oct 2023 17:50:45 -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 1qoWF1-0006Vu-Ny for guix-patches@gnu.org; Thu, 05 Oct 2023 17:50:43 -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 1qoWF1-00006c-GI for guix-patches@gnu.org; Thu, 05 Oct 2023 17:50:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoWFJ-00035a-Sy for guix-patches@gnu.org; Thu, 05 Oct 2023 17:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 09/61] gnu: docbook2x: Fix sgml2xml-isoent and add test dependencies. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169654262911829 (code B ref 65479); Thu, 05 Oct 2023 21:51:01 +0000 Received: (at 65479) by debbugs.gnu.org; 5 Oct 2023 21:50:29 +0000 Received: from localhost ([127.0.0.1]:48794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoWEn-00034i-6U for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:50:29 -0400 Received: from mail-yb1-xb32.google.com ([2607:f8b0:4864:20::b32]:44217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoWEl-00034W-3Z for 65479@debbugs.gnu.org; Thu, 05 Oct 2023 17:50:28 -0400 Received: by mail-yb1-xb32.google.com with SMTP id 3f1490d57ef6-d89491dab33so1694616276.0 for <65479@debbugs.gnu.org>; Thu, 05 Oct 2023 14:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696542602; x=1697147402; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3y5PS6eb/z70jHXZCIKHYcEsd2gudbE1mdql+jbPnYU=; b=bE7pW0Ujbk/9/wpTHXS1dR0tlb3yM593tQKxJE2EMyKipwJIUUj34A0fPZAPjk/W/H DMHA2dZIe7hQ3TsxQgnIheREf6GxLh3OtRRY7hyDf05jrO/ckv73r/tbB+2Z6HvwI1M8 L+ellNvQJWJ+QN0V+9ml/P9JqnTPFFro59mgOlXFREVjyMJRWADNij/hQ/3zNvO8y1st wXBRk+UKS9Iqu0eEVwmHZFQXycgl54OeW/x0/PP2MPUzSmD3wYaPkfYSM5RBb5zEeY4d vRGuWVyuPq8jVRqbiY7q9b7dd7lYgN3GDWCnNcCeuMih6LqioUt8bd5iw7JNVgl5qqBM J9SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696542602; x=1697147402; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3y5PS6eb/z70jHXZCIKHYcEsd2gudbE1mdql+jbPnYU=; b=D6Z+yVJy4rBpXEcgm8uu8PDfEDrueIHbWlCvzqz3o/ylnRi0KwsjFNnlIy9Gq1wrIx SMddkHB7H5OwXvC4TPAAlYwKqsGccXZdock3a1VR1MY7mBCtVbP/wbKsF1KKYH1knpcF BNbJJLoNV268Vfka1Js3aUACgCz6/9Fa+lq5g7qEPf5GCU6lbv6SuDJcAVMid3xFrbul pg2WTwurISMYK6DMbgiuipP2caz/p8wVziljQWsXLny9MRcr0qvgnBY+2xf/bJsnCm56 9JjGEJS1wVQsd77mA3YUNSY9WlsLOsQCiC28+G0YgjzPMDq+SP5zcMrGhLWMOE5eltrS qoxw== X-Gm-Message-State: AOJu0YxoDCLZ8qT7zyvng5PnPGFWcYoNtV8jkyHeGyTzvyQxzrkl/qs3 m+3M1nXjp9M9+TCIP8rChM0c1zW5j5I= X-Google-Smtp-Source: AGHT+IHj8jRRtJA2d5hkcmYqCHzJe1/3tiiMd05I6K/YjedvztsfOviteDdZcMztfOX9bCJ1vSy4Cg== X-Received: by 2002:a25:b285:0:b0:d81:afb1:bf77 with SMTP id k5-20020a25b285000000b00d81afb1bf77mr6090848ybj.28.1696542601785; Thu, 05 Oct 2023 14:50:01 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id a10-20020a0ce34a000000b006575372c845sm821352qvm.119.2023.10.05.14.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:50:01 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Bruno Victal's message of "Wed, 23 Aug 2023 23:35:01 +0100") References: Date: Thu, 05 Oct 2023 17:50:00 -0400 Message-ID: <87v8bkn3hz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.09 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: C890E41514 X-Spam-Score: -5.09 X-TUID: k2B/ZsR0LtQa Hi, Bruno Victal writes: > * gnu/packages/docbook.scm (docbook2x)[arguments]<#:phases>: Add 'sgml-check > phase. > [inputs]: Add opensp. > [native-inputs]: Add docbook-xml-4.1.2, docbook-xml-4.2, docbook-xml-4.4, > tidy-html, groff-minimal and libxml2. > --- > gnu/packages/docbook.scm | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm > index 6a138dcb77..2d1c1f00ad 100644 > --- a/gnu/packages/docbook.scm > +++ b/gnu/packages/docbook.scm > @@ -30,6 +30,7 @@ (define-module (gnu packages docbook) > #:use-module (gnu packages autotools) > #:use-module (gnu packages bash) > #:use-module (gnu packages compression) > + #:use-module (gnu packages groff) > #:use-module (gnu packages imagemagick) > #:use-module (gnu packages inkscape) > #:use-module (gnu packages tex) > @@ -37,6 +38,7 @@ (define-module (gnu packages docbook) > #:use-module (gnu packages perl) > #:use-module (gnu packages python) > #:use-module (gnu packages base) > + #:use-module (gnu packages web) > #:use-module (gnu packages web-browsers) > #:use-module (gnu packages xfig) > #:use-module (gnu packages xml) > @@ -924,6 +926,12 @@ (define-public docbook2x > `("PERL5LIB" ":" prefix ,perl5lib) > `("XML_CATALOG_FILES" " " prefix ,xml-catalog-files))) > programs)))) > + (add-after 'install 'sgml-check > + ;; This is not covered by 'make check'. > + ;; Test that 'sgml2xml-isoent' works. > + (lambda* (#:key tests? #:allow-other-keys) > + (when tests? > + (invoke "make" "installcheck")))) > (add-after 'install 'create-symlinks > (lambda _ > ;; Create db2x_* symlinks to satisfy some configure scripts > @@ -935,6 +943,7 @@ (define-public docbook2x > '("docbook2man" "docbook2texi"))))))) > (inputs > (list bash-minimal > + opensp > perl > perl-xml-namespacesupport > perl-xml-parser > @@ -944,7 +953,11 @@ (define-public docbook2x > libxslt)) > (native-inputs > (list autoconf automake libtool > - docbook-xml-4.5)) > + tidy-html > + ;; For tests I've abandoned adding this kind of comment "For tests."; they are easy to go stale, and it's not clear when new inputs get added later if they are supposed to be included in that group or not. I'd suggest to drop it and reorganize inputs one per line since there are many. Otherwise LGTM. -- Thanks, Maxim