From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 uNnuH771DmXMcgEA9RJhRA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:27:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uNnuH771DmXMcgEA9RJhRA (envelope-from ) for ; Sat, 23 Sep 2023 16:27:10 +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 3B8EBAA5D for ; Sat, 23 Sep 2023 16:27:10 +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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695479230; 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=NeOxfvcZ8Fuin4LJNo0fFdPiET91pRfhBbfSNympAvo=; b=qoV2bVOeigLeFYeo+JU57ddfZXzx7nFFk/8zrYHZCSBgIBQzQWw5DfHTpAtboOi1XxtsJJ DsrVTb/Elw9nrgL3te5U9X/u4+HCpIK/u0vecWg8MvWpnivDp7YHBBrt9eIBerrUzt9s4d q9Dgx/57uX7YMDzbDRq+Dr0qDGQC7+KjQS08marQgnqH9t4L02ujiLOwZtMRX1HEKot/c5 dFtZsB31KDVZUagRrIvXa5JeNMEv2G9JKbz/HqN/Ok6B4AyyfXs51AuRD1OPBOQOKxmlnE WiDir2SPNMJ8/iV5+yatRWs6DcrEdUjyYnc2k74lxdU8Tv6lGj9b806W2Qi/TA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695479230; a=rsa-sha256; cv=none; b=mo6PeqFt4bM2iOXeY4GohyF+DTYMR2HkuCLqgL4SZywrPrukI4K8ByyyZIeZSfgAcOxNr5 zFAkdTr1Mblpkt2kVC3hvOGeQsDw25ig6RWN/aXMc9UCXlTXz/QyGoY9KCwR1C6m2ENE5u DZeB+JwSo8rAtTHpXIGYoY2Q7rBTPdTeZwZ2nAuGDKsGAzF3YUtTnk58arYMi7+OSih5Um KTFMBEuDeG+ZC9WERrBnc5IPX4nsy5PHo8rtq9GYdkJHqzLrfEQt+osOgvR0Ai62KRJwFC Dae43vbbvw7LuW3k3xiR66ydRWNFW1dCUvyfAPAifgEVAPRAqd5+nD+idlnV0A== 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3b1-0002AV-Ao; Sat, 23 Sep 2023 10:26:59 -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 1qk3au-00027f-1y for guix-patches@gnu.org; Sat, 23 Sep 2023 10:26:53 -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 1qk3at-0004Ml-Q9 for guix-patches@gnu.org; Sat, 23 Sep 2023 10:26:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3b4-0008H3-Va for guix-patches@gnu.org; Sat, 23 Sep 2023 10:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 09/62] 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: Sat, 23 Sep 2023 14:27:02 +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.169547920531770 (code B ref 65479); Sat, 23 Sep 2023 14:27:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:26:45 +0000 Received: from localhost ([127.0.0.1]:40309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3am-0008GM-JT for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:26:44 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:32776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3ak-0008GD-Cf for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:26:42 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 957FF20DF2 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:26:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 326E18009B; Sat, 23 Sep 2023 16:21:18 +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 KV5BSpa8cBBA; Sat, 23 Sep 2023 16:21:17 +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 AD30F80095; Sat, 23 Sep 2023 16:21:17 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:19:44 +0100 Message-ID: <6ae5c94fe1f102c7961dfc4f7c965cf8e6afcbdb.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 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-Migadu-Spam-Score: -4.74 X-Spam-Score: -4.74 X-Migadu-Queue-Id: 3B8EBAA5D X-TUID: v5Xyyf78O3Yi * 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.41.0