From patchwork Fri Aug 27 04:15:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32327 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 5A58927BBE1; Fri, 27 Aug 2021 05:17:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C288F27BBE1 for ; Fri, 27 Aug 2021 05:17:10 +0100 (BST) Received: from localhost ([::1]:33614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJTIj-0001ZQ-Lp for patchwork@mira.cbaines.net; Fri, 27 Aug 2021 00:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJTIc-0001Z9-Vs for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJTIc-0005JS-Nm for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJTIc-0006x5-Jm for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50131] [PATCH 2/3 v2] gnu: Add docbook2x. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Aug 2021 04:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50131@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50131-submit@debbugs.gnu.org id=B50131.163003779926676 (code B ref 50131); Fri, 27 Aug 2021 04:17:02 +0000 Received: (at 50131) by debbugs.gnu.org; 27 Aug 2021 04:16:39 +0000 Received: from localhost ([127.0.0.1]:50982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTIA-0006w8-Mk for submit@debbugs.gnu.org; Fri, 27 Aug 2021 00:16:39 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:52827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTI5-0006vq-44 for 50131@debbugs.gnu.org; Fri, 27 Aug 2021 00:16:33 -0400 Received: by mail-pj1-f41.google.com with SMTP id h1so3684928pjs.2 for <50131@debbugs.gnu.org>; Thu, 26 Aug 2021 21:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUIf9d1Bp4uSqVLNT77QtmW1b0uyEfvRrKu6XudrOLo=; b=ot43Ea/pCpz6uPssOJXj3se1tasm08L9UDylKbUoQBf8V3KOMQF6AR6TYK4RCeKnHG /8+KBRypFqFmxM73ygnsBgX/2cS4RrhUCFmarJc/AP6Ku2CSjkGGid5RsoZwv5qDizhn bBheaQwWj3acJOzDN6pc5DXZLbRG0nU6plqa6jW8ek/v+I+sK3L5OawOLT5HVtUnXOjt kZaV0WwbH1by4GtJM6py5/nBugZPGxE3IHxJ2jhiN5ZxixdOSRWfzowqU9LEk2CNruPI v39UOX5pA7xNroc5fK7pcVzSgQrAuzPyDDp2herK55dtBHjrbGkWNL8KQsXYK1WaDDh3 LeRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUIf9d1Bp4uSqVLNT77QtmW1b0uyEfvRrKu6XudrOLo=; b=g3+z+s3ur5A0cjShGF3cH2S1bJAY+mtyTzH5lSrbVdqGaDPjePKnVMXXcudSQ6ac7+ DW3gjimegjxASJ01Oz3iMvdVg2HIsQzWW3BOrZnviHECG5GgAi0b2wCQM2g0bd6ntNSG 0fNjqScrhbj23Kn6JqCmk9TBE1MylgQI2y85L2GS+fb9V8IBbOEObJyk8CYCHQwCSzdy DSz96PI9yhjflJS2MqhHJrQnfSwugLewkSJCj0EVvhDhBp+pRp3j/nCpo1OIWYoS3gyV akLY7/1qLjjt3KpnmtjmOI8ujF45JBdY+81f2P4RO3IsKX/D4bg+dsrveMHerzItwUvo ymhg== X-Gm-Message-State: AOAM530AaXi/fmtqeVLOugxepT33++V7+QsUX7G58tA7qX3Wt8OIZqWn CoU7pe5RY0ybFCrlmpV7W19A5pssy6Ll7g== X-Google-Smtp-Source: ABdhPJwgU6XytgxllOeNd2btY6lbcPdd9cMEznh6SkwRQ4YllUnPzpa9C9kDtz5438c7im0uVjMGEw== X-Received: by 2002:a17:902:ec92:b0:135:772b:89b3 with SMTP id x18-20020a170902ec9200b00135772b89b3mr6740988plg.74.1630037782956; Thu, 26 Aug 2021 21:16:22 -0700 (PDT) Received: from localhost.localdomain ([2001:8000:1ab6:ff00:da0b:fdd8:d6b3:9e94]) by smtp.gmail.com with ESMTPSA id ml10sm666452pjb.9.2021.08.26.21.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 21:16:22 -0700 (PDT) From: Andrew Whatson Date: Fri, 27 Aug 2021 14:15:36 +1000 Message-Id: <20210827041536.13774-1-whatson@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210820120907.83191-1-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook2x): New variable. --- gnu/packages/docbook.scm | 94 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 6a69f8cf89..ba90376e8b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Mark H Weaver +;;; Copyright © 2021 Andrew Whatson ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,10 +25,13 @@ (define-module (gnu packages docbook) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages base) #:use-module (gnu packages xml) @@ -35,6 +39,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix build utils) #:select (alist-replace)) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) @@ -473,3 +478,92 @@ DB2LaTeX.") (package/inherit dblatex (inputs (alist-replace "imagemagick" `(,imagemagick/stable) (package-inputs dblatex)))))) + +(define-public docbook2x + (package + (name "docbook2x") + (version "0.8.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/docbook2x/docbook2x/" + version "/docbook2X-" version ".tar.gz")) + (sha256 + (base32 + "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0")))) + (build-system gnu-build-system) + (inputs + `(("bash-minimal" ,bash-minimal) + ("docbook-xml" ,docbook-xml) + ("perl" ,perl) + ("perl-xml-namespacesupport" ,perl-xml-namespacesupport) + ("perl-xml-parser" ,perl-xml-parser) + ("perl-xml-sax" ,perl-xml-sax) + ("perl-xml-sax-base" ,perl-xml-sax-base) + ("texinfo" ,texinfo) + ("xsltproc" ,libxslt))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-sources + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Fix failed substitution in config.pl + (substitute* "perl/config.pl" + (("\\$\\{prefix\\}") + (assoc-ref outputs "out"))) + ;; Fix a failing test (maybe it worked with old texinfo?) + (substitute* "test/complete-manuals/at1.xml" + (("") + "")) + ;; Patch all the tests use DocBook 4.5 + (substitute* (find-files "test" "\\.xml$") + (("\"-//OASIS//DTD DocBook XML V4\\..+//EN\"") + "\"-//OASIS//DTD DocBook XML V4.5//EN\"") + (("\"http://www\\.oasis-open\\.org/docbook/xml/4\\..+/docbookx.dtd\"") + "\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"")) + ;; Set XML catalogs for tests to pass + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")))) + (add-after 'install 'wrap-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (programs + (map (lambda (p) + (string-append out "/bin/" p)) + '("db2x_manxml" "db2x_texixml" "db2x_xsltproc" + "docbook2man" "docbook2texi"))) + (perl5lib + (map (lambda (i) + (string-append (assoc-ref inputs i) + "/lib/perl5/site_perl")) + '("perl-xml-namespacesupport" + "perl-xml-parser" + "perl-xml-sax" + "perl-xml-sax-base"))) + (xml-catalog-files + (list (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")))) + (map (lambda (program) + (wrap-program program + `("PERL5LIB" ":" prefix + ,perl5lib) + `("XML_CATALOG_FILES" " " prefix + ,xml-catalog-files))) + programs)))) + (add-after 'install 'create-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Create db2x_* symlinks to satisfy some configure scripts + ;; which use these names to differentiate from an older + ;; docbook2man script provided by docbook-utils. + (map (lambda (prog) + (symlink prog (string-append out "/bin/db2x_" prog))) + '("docbook2man" "docbook2texi")))))))) + (home-page "http://docbook2x.sourceforge.net") + (synopsis "Convert DocBook to man page and Texinfo format") + (description + "docbook2X is a software package that converts DocBook documents into the +traditional Unix man page format and the GNU Texinfo format. Notable features +include table support for man pages, internationalization support, and easy +customization of the output using XSLT.") + (license license:expat))) From patchwork Fri Aug 27 04:15:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Whatson X-Patchwork-Id: 32328 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 1DAC727BBE3; Fri, 27 Aug 2021 05:17:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DECAF27BBE1 for ; Fri, 27 Aug 2021 05:17:11 +0100 (BST) Received: from localhost ([::1]:33652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJTIl-0001bL-1V for patchwork@mira.cbaines.net; Fri, 27 Aug 2021 00:17:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJTId-0001ZG-Cs for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJTId-0005K6-44 for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJTId-0006xC-05 for guix-patches@gnu.org; Fri, 27 Aug 2021 00:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50131] [PATCH 3/3 v2] gnu: Generate man pages for lxc. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Aug 2021 04:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50131@debbugs.gnu.org Cc: Andrew Whatson Received: via spool by 50131-submit@debbugs.gnu.org id=B50131.163003781226702 (code B ref 50131); Fri, 27 Aug 2021 04:17:02 +0000 Received: (at 50131) by debbugs.gnu.org; 27 Aug 2021 04:16:52 +0000 Received: from localhost ([127.0.0.1]:50985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTIS-0006wc-Eu for submit@debbugs.gnu.org; Fri, 27 Aug 2021 00:16:52 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:46902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTIR-0006wQ-EK for 50131@debbugs.gnu.org; Fri, 27 Aug 2021 00:16:51 -0400 Received: by mail-pg1-f182.google.com with SMTP id w7so3788882pgk.13 for <50131@debbugs.gnu.org>; Thu, 26 Aug 2021 21:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BbSKxFUHmQJL4MnvC/obFgFEtj1tQbUlBOT3SMVzgrM=; b=Xaxwgx15Gu5QS+iy0pzNEQHobJNDfA+/zb6aNfvcVJVoMEjDBBKSoyqEUoZSHsmXpA fR3NNt+4Zfzy2/kpDKrHL1SWHiZww0oU0O0B0MTIjuhVTRQh8gOq4gQ5jKBsktcOU6fc ZpJJ/hXbJBsTanOXl450mJEs1+evJSEgB4iJPfTJCU0HK895d5R6Rke959PBj6zQbQRT YEEBh+E8FS0Ky7ZIujE+qCN09S5aS3fjiY0pbbYCvbhDyejoktcihY3dvWE+60oIhNBv x4+L9GS/qCM0N7TwrfSTmqfbIELEtwcRENeGb67tpDbgPsKnZl9r4XLa5l4trXgi7cEp Cj1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BbSKxFUHmQJL4MnvC/obFgFEtj1tQbUlBOT3SMVzgrM=; b=MR7jJWqWe5h03Rroqq+JJ8q6MFAgJIumKiZO+vLXxCRhuXVqRTMB5+pRi7cH82rgej 9p1lblBbi/COA1yIC01qdpoAurEvQRq6WMkLlaTwp36m/ybSfsjMcpBR7sHb5BqFUCFF vd8mSSErqK8FjR/AcnZ/8pLQWiz542IeSU2EcMl1QgjDjoieoZ+MvN0WtdXnDFSLaDx3 XMgKfjqleWmshe5Lu7+GE2fG31pXaEh9B32WNwgNUDcT/OM69sCEGgWOD8uERlX4ZT/D wBqZjCzxwbMK3UdHPB4ZzatNi0H65StKXSIsAIvBU3dF4fiDXCYH5w720FFh3Q3TotiT BE3Q== X-Gm-Message-State: AOAM530y1Z+dMc2a4PnlpQb78JC1mZpAY0b96iaviMPgIXVv2rx0HMyX h5yKqyPk8gu+387Edqg1TfopRERG9e7xzQ== X-Google-Smtp-Source: ABdhPJwtTFwQa5A0gXG5WqXUyXsHWJ5BQfjizXYLKDJIA7qY4UDdTyBE6v2Cu9sPFPCh0l3Pe0+Aiw== X-Received: by 2002:a05:6a00:1245:b029:30f:2098:fcf4 with SMTP id u5-20020a056a001245b029030f2098fcf4mr7024852pfi.66.1630037805700; Thu, 26 Aug 2021 21:16:45 -0700 (PDT) Received: from localhost.localdomain ([2001:8000:1ab6:ff00:da0b:fdd8:d6b3:9e94]) by smtp.gmail.com with ESMTPSA id ml10sm666452pjb.9.2021.08.26.21.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 21:16:45 -0700 (PDT) From: Andrew Whatson Date: Fri, 27 Aug 2021 14:15:38 +1000 Message-Id: <20210827041536.13774-2-whatson@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210820120907.83191-1-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (lxc)[inputs]: Add docboo2x. --- gnu/packages/virtualization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e952c009b5..667dd0fa3e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1008,7 +1008,8 @@ all common programming languages. Vala bindings are also provided.") "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("docbook2x" ,docbook2x))) (inputs `(("gnutls" ,gnutls) ("libcap" ,libcap)