From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CMHuM36K5mQO2AAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qOcFM36K5mQLgQEAG6o9tA (envelope-from ) for ; Thu, 24 Aug 2023 00:38:54 +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 9130A69DDE for ; Thu, 24 Aug 2023 00:38:54 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830334; a=rsa-sha256; cv=none; b=AJDsaI8TAblKDKTAPJzH9v78TcrSQysVsSVMcUWU2sycN9DYtkwJrp7loEk+zJIs8nm76o xMRNBhELwvB2p7VY1K57RLeJrHhuS0zK0OvrReGnatWo4e41XBJx5whb5HQXICSJkPSzeP HZrZbyUQ5CbvpFfgqJttZG0O6tWTeGvWQGojzozbqbva+VPGG1xvjkkbPk3EQZf1Dcp58n CXHtd4SYrbB6KcAtVC/NI0b9bViCR4BluLUy2dIUzO6nn9guyILqRRl5fupMYXTstvi7N+ 4NCxuIq1w9T6TF+6XH1jAQ9iiHC39gz893kpJsaFOq76dPgWaI8pEmVePQtnsA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830334; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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; bh=uBs/mr6l9raXX7Cpu9ywmMVOn2qMN0UrnySic1lV4Ow=; b=kI0tWl6zzyUbI2RsFDTL0BSfhwoVHSqi/cnLu6IFAZ8GOS5t36Jb3XpisgX0YBHhCWaMyj WNMLH+TsvAPEt05oYzsIdeTrC9NfIP+KwyD8S+Hn9wTrjK4X30xzfkGhrnzcZ+5hhom+EV O/2dxoqp8yreVsKigO40Tv1A5ortKWYNpUUy3Ego7cAhb6o+TbvRMLUsxvWRLnDNNsrpTB 7W5+L65/4pkyo0FuoagemO0t5PZfNmzQqwVaUprnHx4so2uYFeM9xSJPXg1B4t/lre49N8 WDNwMxgWcGmW8rYok3tDI4sdLGR333Og3HUEVjMQUv+UqP5O7NYjvAIf3B1mrw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTP-0007s9-Hi; Wed, 23 Aug 2023 18:37:11 -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 1qYwTF-0007mP-Jq for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -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 1qYwTF-0004va-9R for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTI-0004AR-T1 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:04 -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: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:04 +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: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283018915567 (code B ref 65479); Wed, 23 Aug 2023 22:37:04 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:29 +0000 Received: from localhost ([127.0.0.1]:35343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSh-00042e-Qh for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:28 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:33644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSW-00040v-TS for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:17 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 985C320CED for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 7066A8009A; Thu, 24 Aug 2023 00:36:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IKU67usrlUfO; Thu, 24 Aug 2023 00:36:08 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 50B068009B; Thu, 24 Aug 2023 00:36:07 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:01 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Scanner: mx0.migadu.com X-Spam-Score: -4.71 X-Migadu-Queue-Id: 9130A69DDE X-Migadu-Spam-Score: -4.71 X-TUID: d7SYaBT2O+wR * 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 + docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.4 + docbook-xml-4.5 + groff-minimal libxml2)) (home-page "https://docbook2x.sourceforge.net") (synopsis "Convert DocBook to man page and Texinfo format") (description -- 2.40.1