From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wCfNCbpfJGUzewEA9RJhRA:P1 (envelope-from ) for ; Mon, 09 Oct 2023 22:16:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wCfNCbpfJGUzewEA9RJhRA (envelope-from ) for ; Mon, 09 Oct 2023 22:16:58 +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 0BEC931CEB for ; Mon, 9 Oct 2023 22:16:58 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696882618; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=0qWVfHXSd+AaeMWVBX7wbyBtAD+otkDo/4Tjbq/L82I=; b=nsn0LuextB8eQsfMEtqf1Tn/5+VKxXfUGiWNlPiSU591quqy2nlTBpHv9zl9SV1aK5oQ8l y25vvGXsH9A4f4BsRJnWYCU0xJnoCJJi8Xe1C6EyxX7eTFiQjZFxN0T5ByxR9pp+yksgY/ mB2vKFAz1CSnZNLXy7qv8PHBA+ZL21LEMnWikCbHCClp5+W76eLZhPQfDzj3IJ9UXrfzz3 7z0r2Pt5UNsUW2gwtOE8cWrkUcGP51q54My2IkopkC/QJwMAzHhs5XFSBnXdxbFJO095sB wAKXUCAOxEL+lN4X+JNHN3gIMn5lFwkLez413OPyey9k2ErgSBQwyimoRBWk5Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696882618; a=rsa-sha256; cv=none; b=XlGDaHKjRp6Q9ptIAiZS81qQT/1hoxAc4NbYqB7rQKJ0TxsaHMRBrzuppLCq9LH3eQ31k+ v/TeSsI161iLM2cJ70G5SjnspNH4NitB4fXQdwWFF0TLzxSwluVb4Mh2HI6Ba2P2istA5v QMPdLTJrI8iqcofVU27MWd+rqr/URrUlPqmJJUDymEFEnxicEQdXr2vgjzVS/jh+t7Nmby x2/Rmu75nNd6HQaM7rKvSU23YsvNxjqLqpR5QlyM7VX88YY29AM9Art5c3Y1DhhKJEetvf L+AmbrMYVKZsCp42yNIQdMgi8YzwTcxZFKa9w5DrxZuvbdbaf1tjBitsAAF0oQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwgK-0001Hb-CZ; Mon, 09 Oct 2023 16:16:51 -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 1qpwgE-0001HA-1l for guix-patches@gnu.org; Mon, 09 Oct 2023 16:16:43 -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 1qpwgD-00022B-QF for guix-patches@gnu.org; Mon, 09 Oct 2023 16:16:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwgY-00030p-HT for guix-patches@gnu.org; Mon, 09 Oct 2023 16:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 08/63] gnu: docbook-xsl: Add compatibility entry. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:17:02 +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.169688262011565 (code B ref 65479); Mon, 09 Oct 2023 20:17:02 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:17:00 +0000 Received: from localhost ([127.0.0.1]:33444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwgV-00030T-KH for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:16:59 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:56636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwgS-00030K-WA for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:16:57 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id A111C20D7F for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:16:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 9E34A8009D; Mon, 9 Oct 2023 22:07:18 +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 hiGrX6HD1jWd; Mon, 9 Oct 2023 22:07:18 +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 9D71380060; Mon, 9 Oct 2023 22:07:14 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:05:56 +0100 Message-ID: <3dd3f5197c0dd390fbc05579680fe10a0eaf2405.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.19 X-Spam-Score: -5.19 X-Migadu-Queue-Id: 0BEC931CEB X-Migadu-Scanner: mx2.migadu.com X-TUID: R4uTBPMe2/E6 Remap "http://docbook.sourceforge.net/release/xsl-ns/" to "http://docbook.sourceforge.net/release/xsl/". * gnu/packages/docbook.scm (docbook-xsl)[arguments]<#:phases>: Add compatibility entry. --- gnu/packages/docbook.scm | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index d23844306c..b3b7a37249 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -388,7 +388,46 @@ (define-public docbook-xsl "http://docbook.sourceforge.net/release/xsl/current/" store-uri catalog)) - (list "rewriteSystem" "rewriteURI"))) + (list "rewriteSystem" "rewriteURI")) + + ;; Originally the + ;; "http://docbook.sourceforge.net/release/xsl/" + ;; URI referred to the non-namespaced docbook-xsl, + ;; with its namespaced version using a URI differing in + ;; the path component as '…/xsl-ns/'. + ;; At some point the namespaced version was made the + ;; canonical docbook-xsl package whilst preserving the + ;; original URI. + ;; + ;; For compatibility with XML files that still specify + ;; the legacy namespaced docbook-xsl URIs we re-add them + ;; here. + (for-each + (lambda (type) + ;; Remap /xsl-ns/ to /xsl/. + ;; Note: URI resolutions are not recursive. + ;; A rewrite rule from: + ;; 'http://docbook.sourceforge.net/release/xsl-ns/' + ;; to + ;; 'http://docbook.sourceforge.net/release/xsl/' + ;; will not trigger the rewrite rule that ultimately + ;; remaps to a /gnu/store URI, as can be seen by + ;; invoking: + ;; $ xmlcatalog "" \ + ;; 'http://docbook.sourceforge.net/release/xsl-ns/current/' + ;; http://docbook.sourceforge.net/release/xsl/current/ + ;; $ xmlcatalog "" \ + ;; 'http://docbook.sourceforge.net/release/xsl/current/' + ;; file://gnu/store/…/xml/xsl/… + ;; + ;; See XML Catalog specification, item 7.2.2. for + ;; details. + (invoke xmlcatalog "--noout" + "--add" type + "http://docbook.sourceforge.net/release/xsl-ns/current/" + store-uri + catalog)) + (list "rewriteSystem" "rewriteURI"))) catalog-files)))) (replace 'install (lambda _ -- 2.41.0