| Message ID | 85e525e36351e2cdacd4da84c5d8756eea3534cf.1696881354.git.mirai@makinata.eu |
|---|---|
| State | New |
| Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5CDF427BBE2; Mon, 9 Oct 2023 22:19:49 +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 F0F0027BBEA for <patchwork@mira.cbaines.net>; Mon, 9 Oct 2023 22:19:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qpxeL-0007Wv-UB; Mon, 09 Oct 2023 17:18:50 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qpxeI-0007UN-4E for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qpxeG-0006y2-M3 for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qpxeb-0007ef-F8 for guix-patches@gnu.org; Mon, 09 Oct 2023 17:19:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 53/63] gnu: git: Drop docbook workarounds. Resent-From: Bruno Victal <mirai@makinata.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 21:19:05 +0000 Resent-Message-ID: <handler.65479.B65479.169688629629212@debbugs.gnu.org> 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 <mirai@makinata.eu> Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169688629629212 (code B ref 65479); Mon, 09 Oct 2023 21:19:05 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:16 +0000 Received: from localhost ([127.0.0.1]:33527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qpxdo-0007az-0h for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:16 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:57016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mirai@makinata.eu>) id 1qpxdl-0007aU-GA for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:14 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id BDE4120C53 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:39 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 333468009D; Mon, 9 Oct 2023 23:17:39 +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 H-qBjhK-NCU9; Mon, 9 Oct 2023 23:17:38 +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 B7CA680095; Mon, 9 Oct 2023 23:17:38 +0200 (CEST) From: Bruno Victal <mirai@makinata.eu> Date: Mon, 9 Oct 2023 21:06:41 +0100 Message-ID: <85e525e36351e2cdacd4da84c5d8756eea3534cf.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1696881354.git.mirai@makinata.eu> References: <cover.1692828533.git.mirai@makinata.eu> <cover.1696881354.git.mirai@makinata.eu> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
| Series |
Docbook & XML/SGML improvements
|
expand
|
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cc6d9745a0..ae1dc3ca86 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -540,20 +540,6 @@ (define-public git (add-after 'build 'build-subtree (lambda* (#:key native-inputs 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 " - (search-input-directory - (or native-inputs inputs) - (string-append - "xml/xsl/docbook-xsl-" - #$(package-version docbook-xsl))) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) (invoke "make") (invoke "make" "install") (invoke "make" "install-doc") @@ -706,6 +692,7 @@ (define-public git ;; For subtree documentation. (append asciidoc docbook2x + docbook-xml-4.5 docbook-xsl libxslt pkg-config