From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CMThAUsFD2Vi4AAAauVa8A:P1 (envelope-from ) for ; Sat, 23 Sep 2023 17:33:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CMThAUsFD2Vi4AAAauVa8A (envelope-from ) for ; Sat, 23 Sep 2023 17:33:31 +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 B4D8C45D12 for ; Sat, 23 Sep 2023 17:33:30 +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=1695483210; 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=ab9TM8lvbaNgmvXl5YmOtLR60ONSWcmGCrF27k/8ddI=; b=hpIqG+deEWf5J2MEFlzAdNh0sa1x4slpK4LI2QLFH52D+wxBi2KpA0AKNXdqTZUl3NIPMC HKOLhnhkyFU2NUN0ZRIno7NFKEzD4IgheuMdtLeqjWbK3xj9jKsHED0+FjsDL+mwfdFF3Z erRBKoVFqXu42eqHijQjys0RZtL1vnpEsrsSp6r4pGxtzPXxRpjH+kMHe7t0KWhzqqaRID koNbYfZ2riucn9/Z7ddR7sKRAOBRq31XCgo5A+mCYzbia6L2n9k3cWCD+LI9BnXuJ/ttSx +BqFaCAWwX6Twzo6C/yJ58AtX1UU9I7TeRZhnQ6Nba+s4y/Y7ge3FQTS0eQm3Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695483210; a=rsa-sha256; cv=none; b=T+j/yJ6lpudO2F0kZhQ+dJPgFNeCqnjI6BxEkVEcIlKkmJ0ko8CuKDxlJjqshDkpWb+HPg 2te88S6nbaGZKc9E2QaTBfNTuMtr8zg9dlicWo3kG8qNc8hQ5UwAc0jBDfGhdNQFBkAfC0 NgimVYCpAsSMOmInSi2aKgUzMnlIVjT+Wg6RncLz1pJUR8S3XcPGEmAs2b4DmX2jhyafCz dZJS8p8HOYfxMyGy8XE44MRb0uBBjDLGO6KikMtQNnUq/zbfpV4P4IVdxLODiNofPCKmUH UNZU8qj+Hf2UXn2AeE9+b48HDjN5Gwi8U9Tkd0H0v6aRrVvw3P6MYY/P8xdCeQ== 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 1qk4cu-0004P4-1P; Sat, 23 Sep 2023 11:33:00 -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 1qk4cs-0004Mp-2T for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:58 -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 1qk4cr-0001BT-Pd for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4d3-0004Lu-16 for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 52/62] gnu: git: Drop docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:33:09 +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.169548317016541 (code B ref 65479); Sat, 23 Sep 2023 15:33:09 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:32:50 +0000 Received: from localhost ([127.0.0.1]:40398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4ck-0004Id-0T for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:50 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:43430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4cO-0004H4-9T for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:28 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 51B2620788 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C49C580097; Sat, 23 Sep 2023 17:31:50 +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 XSvoi7ayHEWW; Sat, 23 Sep 2023 17:31:50 +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 9AA6780092; Sat, 23 Sep 2023 17:31:48 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:27 +0100 Message-ID: <2c3b9a753e2696e00dff8b7e2e44afb95010d769.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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -4.77 X-Migadu-Spam-Score: -4.77 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: B4D8C45D12 X-TUID: dqft+oiadOTA * 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 9f9392fad1..9e6b9cd1ac 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -262,6 +262,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) @@ -382,17 +383,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") -- 2.41.0