From unknown Thu Jun 19 14:03:08 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#50131 <50131@debbugs.gnu.org> To: bug#50131 <50131@debbugs.gnu.org> Subject: Status: [PATCH 0/3] Add docbook2x and generate lxc man pages. Reply-To: bug#50131 <50131@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:03:08 +0000 retitle 50131 [PATCH 0/3] Add docbook2x and generate lxc man pages. reassign 50131 guix-patches submitter 50131 Andrew Whatson severity 50131 normal tag 50131 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 20 08:03:33 2021 Received: (at submit) by debbugs.gnu.org; 20 Aug 2021 12:03:33 +0000 Received: from localhost ([127.0.0.1]:33087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3FF-0001Cn-GY for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:03:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:51764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3FE-0001Cg-7Y for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3FE-0006Es-0h for guix-patches@gnu.org; Fri, 20 Aug 2021 08:03:32 -0400 Received: from mail-yb1-xb2f.google.com ([2607:f8b0:4864:20::b2f]:38905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3FC-0003jl-MG for guix-patches@gnu.org; Fri, 20 Aug 2021 08:03:31 -0400 Received: by mail-yb1-xb2f.google.com with SMTP id a9so14946116ybr.5 for ; Fri, 20 Aug 2021 05:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=b3tX5ZpzoE+IYevO8mA/3odYgdSnblQDz0Rj9XLEn4c=; b=H81w4JuJ4IUKgQ8i/Aztml+28+y8v6OIU/JnrRhurbhWhts20ssV6AeX1LQkA8HPRZ mg+2hUA0vNKsAK/6CpaZxc/G0obCwu3ey45KjhuAqSa5WLahzJLBA6SDucvMWYJxiBp3 l7U046656lD7dGja73Aa5gcQaoAP5nited5qWDJ3gdhOfiztb0X0XUA03KejC7zEkl9Z UhhOOfcrw9Msaj/rHeSDutq5g18GKwaWCpah9WSFPODyX/IUtxj8MaY5PGMLLHuB7ESJ gbjnl9v3Yj232VdHJpziotAjbbXm+pEJtzELV4qmmRxjOoK9a+bt8NnkWmW5CBePp+ry SUEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=b3tX5ZpzoE+IYevO8mA/3odYgdSnblQDz0Rj9XLEn4c=; b=DTmpw3P+/R09lrb1q+MvrWV3kMxv01MNih/rBXFcL51OGnqG4IbraSXZn+LPuNM++V 3roAffgpri8CWVlsDgnbPLXmhXzBdWUlH4x5ANuumE5aVf8CLfZFWFFc8myV4RWvODa9 qK5XMOG9yZiR1wGVJhrDA1lZT5QXYYBOs9tWiEZCGCfCSAhX2cwb5UvIOlbIg4RP/H66 nYKH3onca8DgDeF6EgWfSPYRw/M8HrH9xxYcaK6hqezEvFQXVlfwmDcoHZuivTTu1hg+ e3/Njf+0h4/Zns4Nna7xFofAvB7nMyhBpiRoxidD+/DbPmYAKc6QyNUImwSkbGyMv5Se K+KA== X-Gm-Message-State: AOAM5307aT3GnmHu3zo3R2vQzn/oGkCLib5L+93liZ8Gfg7st3VXQE0v 2DZ3cp6Q10f3SKTpz2ruUaazbaJwHIhJ3GCbkGrww1f8+5s= X-Google-Smtp-Source: ABdhPJwe33rUl/rO6KkCjC8ADyS6G7m7b3dcraP8dLAkaQtAmW1P7lec8k94l96E43de6YuQ8Ab+5tG3bxm8jp3ac8g= X-Received: by 2002:a25:7806:: with SMTP id t6mr25272523ybc.132.1629461008410; Fri, 20 Aug 2021 05:03:28 -0700 (PDT) MIME-Version: 1.0 From: Andrew Whatson Date: Fri, 20 Aug 2021 22:03:17 +1000 Message-ID: Subject: [PATCH 0/3] Add docbook2x and generate lxc man pages. To: guix-patches@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::b2f; envelope-from=whatson@gmail.com; helo=mail-yb1-xb2f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Andrew Whatson (3): gnu: Prefix licenses in docbook module. gnu: Add docbook2x. gnu: Generate man pages for lxc. gnu/packages/docbook.scm | 103 +++++++++++++++++++++++++++++--- gnu/packages/virtualization.scm | 9 ++ 2 files changed, 103 insertions(+), 9 deletions(-) From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 20 08:09:22 2021 Received: (at 50131) by debbugs.gnu.org; 20 Aug 2021 12:09:22 +0000 Received: from localhost ([127.0.0.1]:33100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3Kr-0001Om-LD for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:21 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:41530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3Kp-0001OV-PM for 50131@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:20 -0400 Received: by mail-pf1-f180.google.com with SMTP id i21so8412888pfd.8 for <50131@debbugs.gnu.org>; Fri, 20 Aug 2021 05:09:19 -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=j+3kXFHC3WN2RLRPpSpm1FtDnj5ZNpZoq3OKPAjIZv8=; b=cMNx1NeMyeM+tFtVG2GsAVJavhl7mJaD9S5sWuCQmK3bHGZM3oJEWkmfJbkzcKonW7 yYZItnFtZNAtJ0LiWZaHcO5Iwg7w3CVVUnx8Q2fDm8356pnLWr2TZoSnan9+r0C/HVqE q1SHV6UajRfFSB3PKKTpB+b571SFbH65oBxbhXi9Qh0WxSU6VMh1/tu4iYmy7/Dn2v5g R3GeogqMefx5JBrIzml4BGUv4e28+gWKSODSVH4TN2/S7yfDD4oULHaJ+ukN4oqPLJlf 4PSuTHlt/1cpCkePa3UDQB+ApdCdh1/DBAAoyLRo7r4NP7DWqi/NiYH+NcPwPjeadHU8 IX4w== 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=j+3kXFHC3WN2RLRPpSpm1FtDnj5ZNpZoq3OKPAjIZv8=; b=JOOzzgHeTrLVfOzGxIxCxmG8TZn3jU1GiGSpKJkVNxUmeWNDOBtUvn3qkMQHTSoFUj zJdmXcxzuhi32HzxzeWiGIulv2d59WbBrgV3BjRc5463Zrb6ksUT3QLG+pUmO08LfUBJ WTX2vai08bjXL+s8509r7s2eM10iiH5bvb+/7Wqoaln+RRglCu1rRGtd7sI8WKI380yT 4Q8Nnb/6RKLwck52jE2bEVqlKFb/PAJkp6/tj85XT2cougfb8SMW2y6KV/FoYfvgPofT h298vqv6ezp78M8uA3IWHCW4xCgPnAI8oPiEgxvazX8gNM2gLTlOsaLPt4/Hv4VKsj9d i+2A== X-Gm-Message-State: AOAM530tWeZDAHwP4vq6MIv8vSAp74AqfOsMStTmkPsiSVvAOimSwRRO 5X5bBWg7YM2pyqrFZUL38TjJsqgUPOo= X-Google-Smtp-Source: ABdhPJzg+5aP6v7iwetgmFeUgt50eAYanajrs/9RytshUKApSKvct04IicEA9FK5ySP/bpP1WPS0Aw== X-Received: by 2002:a63:e00b:: with SMTP id e11mr18642852pgh.190.1629461353474; Fri, 20 Aug 2021 05:09:13 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id gb17sm5543112pjb.26.2021.08.20.05.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:09:13 -0700 (PDT) From: Andrew Whatson To: 50131@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Prefix licenses in docbook module. Date: Fri, 20 Aug 2021 22:09:05 +1000 Message-Id: <20210820120907.83191-1-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This prevents conflicts between expat package and expat license. * gnu/packages/docbook.scm (docbook-xml-5): Prefix license variable. (docbook-xsl): Likewise. (docbook-dsssl): Likewise. (docbook-dsssl-doc): Likewise. (docbook-sgml): Likewise. (iso-8879-entities): Likewise. (dblatex): Likewise. --- gnu/packages/docbook.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 1945fb6a4b..6a69f8cf89 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages base) #:use-module (gnu packages xml) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix build utils) #:select (alist-replace)) @@ -77,7 +77,7 @@ "DocBook is general purpose XML and SGML document type particularly well suited to books and papers about computer hardware and software (though it is by no means limited to these applications.) This package provides XML DTDs.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public docbook-xml (package @@ -215,7 +215,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (synopsis "DocBook XSL style sheets for document authoring") (description "This package provides XSL style sheets for DocBook.") - (license (x11-style "" "See 'COPYING' file.")))) + (license (license:x11-style "" "See 'COPYING' file.")))) (define-public docbook-dsssl (package @@ -256,7 +256,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org/") (synopsis "DSSSL style sheets for DocBook") (description "This package provides DSSSL style sheets for DocBook.") - (license (non-copyleft "file://README")))) + (license (license:non-copyleft "file://README")))) ;;; Private variable, used as the 'doc' output of the docbook-dsssl package. (define docbook-dsssl-doc @@ -294,7 +294,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org/") (synopsis "DocBook DSSSL style sheets documentation") (description "Documentation for the DocBook DSSSL style sheets.") - (license (non-copyleft "file://doc/LEGALNOTICE.htm")))) + (license (license:non-copyleft "file://doc/LEGALNOTICE.htm")))) (define-public docbook-sgml (package @@ -336,7 +336,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (home-page "https://docbook.org") (synopsis "DocBook SGML style sheets for document authoring") (description "This package provides SGML style sheets for DocBook.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public docbook-sgml-3.1 (package @@ -377,7 +377,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (synopsis "ISO 8879 character entities") (description "ISO 8879 character entities that are typically used in the in DocBook SGML DTDs.") - (license (x11-style "" "See file headers.")))) + (license (license:x11-style "" "See file headers.")))) (define-public dblatex (package @@ -461,7 +461,7 @@ to DVI, PostScript or PDF by translating them in pure LaTeX as a first process. MathML 2.0 markups are supported too. It started as a clone of DB2LaTeX.") ;; lib/contrib/which is under an X11 license - (license gpl2+))) + (license license:gpl2+))) ;; This is a variant of the 'dblatex' package that is not updated often. It ;; is intended to be used as a native-input at build-time only, e.g. by -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 20 08:09:31 2021 Received: (at 50131) by debbugs.gnu.org; 20 Aug 2021 12:09:31 +0000 Received: from localhost ([127.0.0.1]:33103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3L1-0001PB-0g for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:31 -0400 Received: from mail-pg1-f170.google.com ([209.85.215.170]:38725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3Ky-0001Ou-U0 for 50131@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:29 -0400 Received: by mail-pg1-f170.google.com with SMTP id w8so8951671pgf.5 for <50131@debbugs.gnu.org>; Fri, 20 Aug 2021 05:09:28 -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=2lRAla9BPXv1ykQx7fftYWM3SfqBPYvZrx2fWuURDck=; b=FRgJklUIutW8K4FeiAOxB+WZj8JIoqH5adSNTPZDjmEKPAwOb48D2ZZPn3gsFvhL7q vqhQQHY9YJpaUJdwgpHEpAFfTadyydPA3ReObXbUIhHmFedk2LNBMdxnm1VdxJMFBmiM ZQVFEoXHNzB0uMcSCpSIOT4WhkvP9JXoqqXVhm18vIVQm3uS3SzPDWwqcv6hpC5EuJeZ FunrlHSKBKARIEtKANB29HPzDqMUGm3HdUhfJaMYs2ylYq2GfHxMfrh1xWKkPvEUnkAA QIpSvOJVAU89zh0XaUjS9/3dtFmnbg+xdb8BgPsaVRnxvGufZGKzlgV7UXBX+kzIRWzq N+tg== 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=2lRAla9BPXv1ykQx7fftYWM3SfqBPYvZrx2fWuURDck=; b=THaB9tkHnQFXqoWwf+brciEMvGZ3putCNiq4cW2aKma6tqgIRRaZs5K8PtVeYZZjk6 HDxgbrv/nP2C3GBB6EYkM4Eoa3vbZ+zcgunoXYddJ5Lpm0TNLdK5bV/xfzUZI/XWYQRl cNbXNWJjgpTwuKilrTOgPEWkqlBTM1XrmhsHR3G1Dv2Z/+7oEcKeEcJvIoT6fG/3/klj 6mMxyxxge7NEz7s+C3I5CMXXLmsXuq8ZvSxofwNlykwsezUaCuhPXvaeEpS64l+egBhy HwkxB0QFkYAuCydxWAxz5EMFAXDZTM1lWcQYoF6YDBUHVOLVcqrcxEvAVtatLugwcoOT /8WA== X-Gm-Message-State: AOAM531hMkO5chrt1Qc5NWPcCFpHwylYx0QO0sXqVZm3QIZ6o0CeAM+A b0HbOxDuF68aEq2wdRHsJ4fVGeb2yDU= X-Google-Smtp-Source: ABdhPJz8Y3rEMNDAM9wgREb2ujXBF4AIffMPJCnha2/Q5wIBEs8GW8PnpmIENuRq8uGek6G2FtcPrA== X-Received: by 2002:a65:6494:: with SMTP id e20mr18803474pgv.101.1629461363177; Fri, 20 Aug 2021 05:09:23 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id gb17sm5543112pjb.26.2021.08.20.05.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:09:22 -0700 (PDT) From: Andrew Whatson To: 50131@debbugs.gnu.org Subject: [PATCH 2/3] gnu: Add docbook2x. Date: Fri, 20 Aug 2021 22:09:06 +1000 Message-Id: <20210820120907.83191-2-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820120907.83191-1-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/docbook.scm (docbook2x): New variable. --- gnu/packages/docbook.scm | 87 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 6a69f8cf89..fdc432eb20 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,85 @@ 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 + `(#:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out"))) + #: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))))))) + (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))) -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 20 08:09:33 2021 Received: (at 50131) by debbugs.gnu.org; 20 Aug 2021 12:09:33 +0000 Received: from localhost ([127.0.0.1]:33106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3L3-0001PP-Es for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:33 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:34325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3L1-0001Oy-Sw for 50131@debbugs.gnu.org; Fri, 20 Aug 2021 08:09:32 -0400 Received: by mail-pl1-f181.google.com with SMTP id j2so1423806pll.1 for <50131@debbugs.gnu.org>; Fri, 20 Aug 2021 05:09:31 -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=zlhIWdoU4anK3Q81W5Sd+ZmrITQ4U5eh5I3TN5Fd7Ec=; b=p1n6D5KH42hHV4CcNCY7um6d7a5NFep4g9bf2H42QI+3NZMme9agq+u1NpwsY3SDrz Lq5lthH3mzCzc/pa6lbdDGdwog9JuC55SH3ecn5Iy0w22DkCA8xMgviRwIS/Yr7JLQnY 9kv0DnseRBsmJEFk3bxkN6ygZz33qcdGizlm0kqNJolPN3jjaWK6VdR8AqiSy+nsKnNi givbKPJo5W6qU1LKJmLxKDRX3YFeFFe+88r5GdnW97/TjfYiQSfDA8PJLeOF3LhtD5bx fl0Oh6E9YkTQfvgzQeWgPzirRY8aQX1J6qUOgX+FYlnUEEh8V1qSKCPJ9Xs239WIc0zb 7Ubw== 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=zlhIWdoU4anK3Q81W5Sd+ZmrITQ4U5eh5I3TN5Fd7Ec=; b=kUD5orxvbiTufbe6EGoMujZVgYcDwT7vdHNCPrCjIuTl/NPIcHQcFOlnzy+UeZScdS VS700JxQv+bBDwhtYTqZy+/NbNtlSsY5MR/6jRtj97qL4L8F8ARFiP8Cw4P9I4+XV6C2 PCs4PQcazg4zUS05OE3bQgb2JbIy5F1SIuIdeGfgfOlmHRtZJz7FJetGjnS69pXQjhnA 0+5LPbc7DXMB48BJXBjB9/2ffGslJXl7ZEkWh2CDxZ/xn+UT4B89u3B4V4dzypmzwHr8 +Jj/U3flrULm/ILLuw9XrM80ETPjzwAoA+tCG/len4ADHakOo6S/+CGW8WNp62wXVzJU RLYw== X-Gm-Message-State: AOAM533hmpFY/gC9mmE2qz12L2LYggn4rXAyzumHyRgw8RYo1tqJVvY0 XvewPOrQFRSZugfK6pz9z19pd2gxx30= X-Google-Smtp-Source: ABdhPJyEtFMhGQ+MrEvXYzxgdjD4/1SHEcACmS7gjMj0nYl4pjZrX1iNfUy6CTRWfFqPHb5Xh+Tfig== X-Received: by 2002:a17:902:ed82:b029:ef:48c8:128e with SMTP id e2-20020a170902ed82b02900ef48c8128emr16347897plj.72.1629461366063; Fri, 20 Aug 2021 05:09:26 -0700 (PDT) Received: from muon.fritz.box (220-235-208-141.tpgi.com.au. [220.235.208.141]) by smtp.gmail.com with ESMTPSA id gb17sm5543112pjb.26.2021.08.20.05.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 05:09:25 -0700 (PDT) From: Andrew Whatson To: 50131@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Generate man pages for lxc. Date: Fri, 20 Aug 2021 22:09:07 +1000 Message-Id: <20210820120907.83191-3-whatson@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210820120907.83191-1-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/virtualization.scm (lxc)[inputs]: Add docboo2x. [phases]{patch-docbook-dtd}: New phase. --- gnu/packages/virtualization.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1bbcb46b99..f1a9e28d3f 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) @@ -1022,6 +1023,12 @@ all common programming languages. Vala bindings are also provided.") "--localstatedir=/var") #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-docbook-dtd + (lambda _ + ;; Fix incorrect DocBook DTD + (substitute* "configure" + (("\\\\\"-//Davenport//DTD DocBook V3\\.0//EN\\\\\"") + "\\\"-//OASIS//DTD DocBook XML\\\" \\\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\\"")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 26 11:37:12 2021 Received: (at 50131) by debbugs.gnu.org; 26 Aug 2021 15:37:12 +0000 Received: from localhost ([127.0.0.1]:50168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJHRD-000279-L6 for submit@debbugs.gnu.org; Thu, 26 Aug 2021 11:37:12 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:11132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJHR7-00026K-Mi for 50131@debbugs.gnu.org; Thu, 26 Aug 2021 11:37:05 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 28E6A40B30; Thu, 26 Aug 2021 17:36:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1629992214; x=1631806615; bh=Ypj4pJPKKWdlsJdLcLjzrrFBacB7SE4U1XQ MHkUlVEM=; b=Q1jWlVufIcVmrHiX2j2DINrX12DYz4sMx+EUo2/TCbtPJrDAZMv +ih9G71Kr4sbjAKfXcG0uBd6MSasnzaDe72lBxoZkwXutIie1X3uvA8P4r6p3hNt evzq2cBla+zD12Zw1RK3bAYgPjfNbCUnnZEcq7fXfjy+Z2h3vmhCk3Q4MUrxuJjZ PPYIadsao+1sFifAG1wYPMLAfg0nYEbk5eQgEe9LgpMaCM/IfvF2EliJzym69iEg 6juWuRPlVAx8PFxWQ+T2/U35vrXsQxDcFlUB5f0ejvxnRbh7N325H5wTlr86t376 ewlclTJuqgvLLhVXup/zkRNFKlGdxKHF42l3lmzPu+PO0XLzZWDtZumzQmue7CHA 6LcT6apveZZ5LUYNUUHOI18o60kNmHAuMXlwYfSCMoOJHhnleVH07ay1iVo7LXi6 zCtxzYXUk3WSIGA4qyKdFdUKG5nFIuN2GUUqgFxEDsFUxuVAnhJg7TvQFFdeKqgV jLHLpdWkPcEokUJHhkc/iQQd5Or4MLM6vmevSP85LLSP8HZFvn1R9jWxFgNhot/s WUjsf2UAkpr92R68owlJWMh1lTmJxpFuJtiZBK31sNl3V6ydJ47+jfILUPxnBLWU Wu0TNh8ivkfFKXBzeG/+r0nOEDsfstvWios2S5CPOPuY4wnluBE/Dr5o= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pFcJs6_C14sI; Thu, 26 Aug 2021 17:36:54 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 966FE407B7; Thu, 26 Aug 2021 17:36:54 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 020895D9; Thu, 26 Aug 2021 17:36:52 +0200 (CEST) From: Thiago Jung Bauermann To: 50131@debbugs.gnu.org, Andrew Whatson Subject: Re: [bug#50131] [PATCH 2/3] gnu: Add docbook2x. Date: Thu, 26 Aug 2021 12:36:45 -0300 Message-ID: <40771916.5y4UuSq5LN@popigai> In-Reply-To: <20210820120907.83191-2-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> <20210820120907.83191-2-whatson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Andrew, Em sexta-feira, 20 de agosto de 2021, =C3=A0s 09:09:06 -03, Andrew Whatson= =20 escreveu: > * gnu/packages/docbook.scm (docbook2x): New variable. > --- > gnu/packages/docbook.scm | 87 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 87 insertions(+) =46WIW, this looks good to me. Just one minor comment below. =20 > @@ -473,3 +478,85 @@ 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/" + =20 > version "/docbook2X-" version ".tar.gz")) + (sha256 > + (base32 > + =20 > "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0")))) + =20 > (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 > + `(#:configure-flags > + (list (string-append "--prefix=3D" (assoc-ref %outputs "out"))) There=E2=80=99s no need to pass the prefix argument. =E2=80=98gnu-build-sys= tem=E2=80=99 already=20 does it. =2D-=20 Thanks, Thiago From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 26 11:50:15 2021 Received: (at 50131) by debbugs.gnu.org; 26 Aug 2021 15:50:16 +0000 Received: from localhost ([127.0.0.1]:50201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJHdv-0002UG-LM for submit@debbugs.gnu.org; Thu, 26 Aug 2021 11:50:15 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:2442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJHdq-0002Tl-VT for 50131@debbugs.gnu.org; Thu, 26 Aug 2021 11:50:14 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id E458FCFF; Thu, 26 Aug 2021 17:50:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1629993000; x=1631807401; bh=xbOcKbvUglM+bdhpXVecBZkOGQUyAC6M66U VZ+yDpXA=; b=I2u44O7BWtYIqVGcE804qo8AMMDiISZZpjetkjoCFRzTv43sGsC QGMsCfQvKL5JZGHN3Jr+2RJBD1onybIC/jNpWwXR+Ar6zPyX0I6WyJr4Bvcu5eCV JyMRdEEdTF4WO5xEMeSM3kBccSZIDALQjB1yZsxwtQrofZwS5ueLfQ3lhNZtE3WR 8H7Q8/ZcuzyrIXKOQgSWF7dRfx/C9SHGJdIJV+H/881PT9P6sz1A+XYnTxGTIjaG bfGo3VKOjXlLgGesQbvNe1kYrvnby0ZGw+M7Sf1vsFoz1ApJAgYSYTYqawVyCD9l cTCm449WyXkiAd4Lwh26Xl77Otagbglmdw4nz8QvGcIvsZdWxnu9ncGLTvHvtPyW WebUjk1DDhOAf9z5fV4q08WdODUXXiHNdyXDvCuUZGaE0ZnyVESN0+h/RHIXCvIl dArriQ6dvo9dM+gzVWhU/xul4tZiERGcRRRUn2zmdsowPf+y1DvXvZExhScTsTHS 9oWR/JWuvV3BhvMoPiKanD/4E+ayzpntpYoR2znF+Z1eh4Nh5mYe14yB1u/tSz5J eJqMJvBlKk08dSdvfeTBIcvQh6KeD5Q/Ccp5aitPip34pft4n95kXGYWlH9hnCd3 5Jh39YrV+rP7ocCHMgXjsVck+7NYe6lplymGsbb0XOAARL89B+6JXlNg= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.899 X-Spam-Level: X-Spam-Status: No, score=-1.899 tagged_above=-10 required=5 tests=[BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hTXeTsiEdnz4; Thu, 26 Aug 2021 17:50:00 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id CE629404; Thu, 26 Aug 2021 17:49:59 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 851332833; Thu, 26 Aug 2021 17:49:58 +0200 (CEST) From: Thiago Jung Bauermann To: 50131@debbugs.gnu.org, Andrew Whatson Subject: Re: [bug#50131] [PATCH 3/3] gnu: Generate man pages for lxc. Date: Thu, 26 Aug 2021 12:49:51 -0300 Message-ID: <2518271.n39fte1hqX@popigai> In-Reply-To: <20210820120907.83191-3-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> <20210820120907.83191-3-whatson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50131 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Andrew, Em sexta-feira, 20 de agosto de 2021, =C3=A0s 09:09:07 -03, Andrew Whatson= =20 escreveu: > * gnu/packages/virtualization.scm (lxc)[inputs]: Add docboo2x. > [phases]{patch-docbook-dtd}: New phase. > --- > gnu/packages/virtualization.scm | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Looks good to me. Just one question below. > diff --git a/gnu/packages/virtualization.scm > b/gnu/packages/virtualization.scm index 1bbcb46b99..f1a9e28d3f 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) > @@ -1022,6 +1023,12 @@ all common programming languages. Vala bindings > are also provided.") "--localstatedir=3D/var") > #:phases > (modify-phases %standard-phases > + (add-before 'configure 'patch-docbook-dtd > + (lambda _ > + ;; Fix incorrect DocBook DTD > + (substitute* "configure" > + (("\\\\\"-//Davenport//DTD DocBook V3\\.0//EN\\\\\"") > + "\\\"-//OASIS//DTD DocBook XML\\\" > \\\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\\"")))) Has this fix been submitted upstream, or is it already available in a newer= =20 lxc version? Ideally, we wouldn=E2=80=99t have to carry this change indefin= itely. The same question would apply to the substitutions made in docbook2x, but=20 that project seems abandoned so there=E2=80=99s no point. =2D-=20 Thanks, Thiago From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 27 00:16:39 2021 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 To: 50131@debbugs.gnu.org Subject: [PATCH 2/3 v2] gnu: Add docbook2x. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 27 00:16:52 2021 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 To: 50131@debbugs.gnu.org Subject: [PATCH 3/3 v2] gnu: Generate man pages for lxc. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: Andrew Whatson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 27 00:21:24 2021 Received: (at 50131) by debbugs.gnu.org; 27 Aug 2021 04:21:24 +0000 Received: from localhost ([127.0.0.1]:50994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTMq-00073k-GE for submit@debbugs.gnu.org; Fri, 27 Aug 2021 00:21:24 -0400 Received: from mail-yb1-f172.google.com ([209.85.219.172]:46798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJTMo-00073Y-PQ for 50131@debbugs.gnu.org; Fri, 27 Aug 2021 00:21:23 -0400 Received: by mail-yb1-f172.google.com with SMTP id k65so10083327yba.13 for <50131@debbugs.gnu.org>; Thu, 26 Aug 2021 21:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=bx0TwqA8Uzg+0Uf4cOWqlzw3X6+ekGNa2VEDN/1ToLo=; b=slMgSkz134Ot9TqcJeofiq3jIXhEd7Au+YiwgsDNbkKsnh64HvB5ASlstbDT0fCcDI YCA9z588Y+Slch85Xh8es2IEimyyROqBYUZWjqwqvN8LxmEnXjzcx4Jy9C7ifqZ1uBNQ 1o/qlML9IIGaXsJQLLXJETBnmE0lqNS1D5DRP4fYd94J615qTXnXtpJl9B8nuOoUBbDe BgR7GfxxctTlSmuMc52HDZGK5ERQr1+upD0pbdSyRTvMtwPZWQPeA0fKR8alD+ECbesv olKCjMU9BwFrtsdBmK1hw9DQtcfFDy//laz3gSTt8ZnxEZrXJ7wzhtjzz0Vhb4ohbUWD lVdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=bx0TwqA8Uzg+0Uf4cOWqlzw3X6+ekGNa2VEDN/1ToLo=; b=nDPbB6c+FTy9qaizfO0Q+iIir4oDZZKTmYFKSQ9BvmjL/X+I5yc7xykippjFf1W8Co YrtiStlLiY4cTGPyvCqShKw62vp/YW3zwxVhVkzISAx9kKP4Z/xbGI0seDvNf1fiP6Vz gT6rZLwmdeAaEx/EXTuZTEzXeit+hKk0o/5pOgypb/jfyFMvcJCHaVkNK0DDvywX9pV5 Vlin3HTyCKxLFI1hTMorhlulTO8tyO0k+dRdpPNWqGaNTfRfRP3kv0JMNMadqLbPverR eD1/rmHPXd/0DeLikmBFTIo89jUzKPwOBnZnuanwD6j8PYye8gEsdCqBAlBH1IxkC/Rh o0hQ== X-Gm-Message-State: AOAM5314uuSguzooy2EE/pEQ3VYVexkASHF4VPTpC7O1R2bmnhJ9uoju O3j/x9tHjt1P71gy2O5NoTLA8JTYKq9pZ+R8hFTtyLsD0fc= X-Google-Smtp-Source: ABdhPJyTWuc7OZBOgmTIey30nfgKvePHUD5g4UskOLovA83I7jIFC8FlgJHpSwfBodkTn0eJUBK3A+iEEdy+5zfgTKs= X-Received: by 2002:a25:cfcc:: with SMTP id f195mr2597033ybg.341.1630038077198; Thu, 26 Aug 2021 21:21:17 -0700 (PDT) MIME-Version: 1.0 References: <20210820120907.83191-1-whatson@gmail.com> <20210820120907.83191-3-whatson@gmail.com> <2518271.n39fte1hqX@popigai> In-Reply-To: <2518271.n39fte1hqX@popigai> From: Andrew Whatson Date: Fri, 27 Aug 2021 04:21:06 +0000 Message-ID: Subject: Re: [bug#50131] [PATCH 3/3] gnu: Generate man pages for lxc. To: Thiago Jung Bauermann Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: 50131@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Thu, 26 Aug 2021 at 15:37, Thiago Jung Bauermann wrote: > > There=E2=80=99s no need to pass the prefix argument. =E2=80=98gnu-build-s= ystem=E2=80=99 already > does it. Thanks, fixed in the revised patch. > > + (add-before 'configure 'patch-docbook-dtd > > + (lambda _ > > + ;; Fix incorrect DocBook DTD > > + (substitute* "configure" > > + (("\\\\\"-//Davenport//DTD DocBook V3\\.0//EN\\\\\"") > > + "\\\"-//OASIS//DTD DocBook XML\\\" > > \\\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\\"")))) > > Has this fix been submitted upstream, or is it already available in a new= er > lxc version? Ideally, we wouldn=E2=80=99t have to carry this change indef= initely. The lxc configure script checks for both db2x_docbook2man and docbook2man (in that order). If it finds docbook2man, it assumes this is an older tool and formats the documents with the wrong DTD. I've revised the docbook2x package to provide a db2x_docbook2man symlink as it's possible other packages using docbook2x will make the same assumption. This means patching configure is no longure required. > The same question would apply to the substitutions made in docbook2x, but > that project seems abandoned so there=E2=80=99s no point. Similar fixes for docbook2x are found in the arch & nix builds, and actually some have been incorporated into its CVS repo but never been released. I haven't tried to get in touch with upstream, but I guess it's worth a shot. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 27 13:48:25 2021 Received: (at 50131) by debbugs.gnu.org; 27 Aug 2021 17:48:25 +0000 Received: from localhost ([127.0.0.1]:52939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJfxo-00072c-Sj for submit@debbugs.gnu.org; Fri, 27 Aug 2021 13:48:25 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:44202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJfxm-00072M-Vh for 50131@debbugs.gnu.org; Fri, 27 Aug 2021 13:48:24 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 9C31040E35; Fri, 27 Aug 2021 19:48:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1630086496; x=1631900897; bh=h18KsdR2e+OHke/S2Xq8VjkfZpDhbh3p9b6 tIEKe1kg=; b=MdEGy8ogQzb9047fn+yCy3EglNBv20Y07nOnZtMLMEGRkoyeo16 B0btltcccD54c5S44grWNNXZ1zkHSjBa5cTWLhpA8AtZq779ENkOvB8Td3WfEWr/ b/2wCNs2GVbIe5PLEbXJfC5ddkB4Cc2ormcxtdL3zuRabmGEZImSkw/xarIUDu32 NCtfxr8OxNtA1QVVZPGg/DGDjb7rBQMv5rQqr8JCIDUl/J9OmW8zM2K/tySuQohr m4/Vk7LIsZab5SJcd5URcfoNFMN4UHFuwWQIQr89Kt2eY6nqQJ6onTgEKMI/EEKA UYUvhPGQBkJ7zLIFHD9HnI0B4SZywJtOe5nj/Mw8GquIoE563393oIqdquDG8I6N 3CEq7rIYQRp5PSt3yYM1CIqiNrVEDsbSx3VhymRyBx7DXPYqLvX2I33vDd8vahaM 8RAvYsHy8dOtigV0Mbg2Sle9BPF8srF95NjeKJdg9UwbF3Kfj1+aT6n8aqXBnScl 5qqmwE6RLtPn4cUqisI32mvY4qPgBb9p2L9VYWd/WTASi/Pm2tlK3QroGmYi32BA nPsx/9ujBwhkn3Er3HuA7rkSWyU4WFqABYJQKRfd1IE9tp+IFJv1VNW3vWooXpq7 ZfW7WfMZso68Gp92J8eu36/s3sIr/gaygKVNbzm2i7C8qyblAir6CbJA= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HHYR2vQJVuz1; Fri, 27 Aug 2021 19:48:16 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 274244067E; Fri, 27 Aug 2021 19:48:14 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 6D70F32E0; Fri, 27 Aug 2021 19:48:12 +0200 (CEST) From: Thiago Jung Bauermann To: Andrew Whatson Subject: Re: [bug#50131] [PATCH 3/3 v2] gnu: Generate man pages for lxc. Date: Fri, 27 Aug 2021 14:48:06 -0300 Message-ID: <1962355.iDUGbKK2k8@popigai> In-Reply-To: <20210827041536.13774-2-whatson@gmail.com> References: <20210820120907.83191-1-whatson@gmail.com> <20210827041536.13774-2-whatson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 50131 Cc: 50131@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Andrew, Em sexta-feira, 27 de agosto de 2021, =E0s 01:15:38 -03, Andrew Whatson=20 escreveu: > * gnu/packages/virtualization.scm (lxc)[inputs]: Add docboo2x. > --- > gnu/packages/virtualization.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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) Awesome! Both patch 2/3 v2 and this one look good to me. The symlink trick was a great find. =2D-=20 Thanks, Thiago From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 13 06:30:43 2021 Received: (at 50131-done) by debbugs.gnu.org; 13 Sep 2021 10:30:43 +0000 Received: from localhost ([127.0.0.1]:44464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPjEZ-0001K1-CZ for submit@debbugs.gnu.org; Mon, 13 Sep 2021 06:30:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPjEX-0001Jm-BJ for 50131-done@debbugs.gnu.org; Mon, 13 Sep 2021 06:30:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60458) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPjEQ-0006hJ-59; Mon, 13 Sep 2021 06:30:35 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=47252 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPjEE-0004pK-FI; Mon, 13 Sep 2021 06:30:32 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Thiago Jung Bauermann Subject: Re: bug#50131: [PATCH 0/3] Add docbook2x and generate lxc man pages. References: <20210820120907.83191-1-whatson@gmail.com> <20210827041536.13774-2-whatson@gmail.com> <1962355.iDUGbKK2k8@popigai> Date: Mon, 13 Sep 2021 12:30:20 +0200 In-Reply-To: <1962355.iDUGbKK2k8@popigai> (Thiago Jung Bauermann's message of "Fri, 27 Aug 2021 14:48:06 -0300") Message-ID: <875yv4ahtv.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50131-done Cc: Andrew Whatson , 50131-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Thiago Jung Bauermann skribis: > Em sexta-feira, 27 de agosto de 2021, =C3=A0s 01:15:38 -03, Andrew Whatso= n=20 > escreveu: >> * gnu/packages/virtualization.scm (lxc)[inputs]: Add docboo2x. >> --- >> gnu/packages/virtualization.scm | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >>=20 >> 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) > > Awesome! Both patch 2/3 v2 and this one look good to me. > The symlink trick was a great find. Applied all three patches. Thanks Andrew, and thanks Thiago for reviewing! Ludo=E2=80=99. From unknown Thu Jun 19 14:03:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 11 Oct 2021 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator