From patchwork Wed Aug 23 22:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53159 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 90CEB27BBE2; Wed, 23 Aug 2023 23:40:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 205F527BBE2 for ; Wed, 23 Aug 2023 23:40:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwVC-0001Pi-0F; Wed, 23 Aug 2023 18:39:02 -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 1qYwVA-0001OH-3P for guix-patches@gnu.org; Wed, 23 Aug 2023 18:39:00 -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 1qYwV9-0005OF-RJ for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwVD-0004K5-Du for guix-patches@gnu.org; Wed, 23 Aug 2023 18:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 52/61] gnu: git: Drop docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:39:03 +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.169283029316516 (code B ref 65479); Wed, 23 Aug 2023 22:39:03 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:38:13 +0000 Received: from localhost ([127.0.0.1]:35493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwUO-0004IE-Kl for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:38:12 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTk-0004GA-7N for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 7E59D20EA5 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id F391F80060; Thu, 24 Aug 2023 00:36:30 +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 sBjDIrUQuRWU; Thu, 24 Aug 2023 00:36:30 +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 27732800AC; Thu, 24 Aug 2023 00:36:22 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:44 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git)[arguments]<#:phases>: Drop docbook-xsl related substitution. [native-inputs]: Add docbook-xml-4.5. --- gnu/packages/version-control.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9342b68177..77f50458be 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -259,6 +259,7 @@ (define-public git ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook2x" ,docbook2x) + ("docbook-xml" ,docbook-xml-4.5) ("docbook-xsl" ,docbook-xsl) ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) @@ -379,17 +380,6 @@ (define-public git (add-after 'build 'build-subtree (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "contrib/subtree" - (substitute* "Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitution. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") - (string-append "$(XMLTO) -x " - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) (invoke "make") (invoke "make" "install") (invoke "make" "install-doc")