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 2Kp8MhyK5mRnvQAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:37:16 +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 YAByMhyK5mSPQQAA9RJhRA (envelope-from ) for ; Thu, 24 Aug 2023 00:37:16 +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 4376345978 for ; Thu, 24 Aug 2023 00:37:16 +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=1692830236; 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=h3xRJOm6V4BstONbtrI5PfGWqCM12el4WUaUUGpaPrI=; b=qY+Q1ngI8cOtLu5UMWLg3eY37w+kp0sI0lvNpLzlk3tM+qp+kdKF7o0dovkIqSALBHRT4M yRoPCceKeKn1DkDGsvK0prl+lNxjKYZqV4QZ7sufQkIB9Ev/jzqa4Ebo1L7ueo1zPUedIC c7Vefciy9ly/pURvaW6Q87Jt5/oqv4IrmBlrQ9eQOSouk83Q5kFuYmUoe/plcmiKfAwxLE F4MO3vdFF8ZcX5CP2JmmIPB+WGKGteu5M8ty7Utu+gvgv9sYPyhPh2RNLkdCB6TiwKxakO 5X54hpZHmQIbaPOtU9O8mNpvSzJbQcp1o2VGOvNhJ2LIxeooXb9Jl593WJgNlA== 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830236; a=rsa-sha256; cv=none; b=jYdAF8YV9p3GwkeHXBhj6UCAp7W48hs6sdtQ61Giy9M/FWtspdveJkh9x/LkqgLFegbPSw zL3OBMU9E1AjOdHXR3Ax6lqi/jLEd5zwq0Phbpw2RC7TYYMP/oefYlXxFUR/5Ba1r0PkYe 2RuFlkD5lfDobsmSRV4rB7EA+q+8PxnKy7q+P8rBonM0sz3wEUidPBs3UZk1IrzjS5M0/R qznmLSsE17MRdQHKozVEi7NBKMTdJqCoqihN0wU8AMgxErPG8rl6gEPhTGQeanN2S1bc5x nl2efKhCSLULqf8dGHDEcPXF5ILRPYv+qOJkIgijPd7AFKSa1I31bT1YbMc0Dw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTJ-0007mw-9w; Wed, 23 Aug 2023 18:37:05 -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 1qYwTD-0007jD-97 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37: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 1qYwTD-0004v7-18 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:36:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTG-00049X-GB for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 04/61] gnu: docbook-xsl: Add compatibility entry. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37: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.169283017415416 (code B ref 65479); Wed, 23 Aug 2023 22:37:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:14 +0000 Received: from localhost ([127.0.0.1]:35319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwST-00040a-Tj for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:14 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:41770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSR-00040C-LR for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:12 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 4BC9E20724 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5517080097; Thu, 24 Aug 2023 00:36:06 +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 Le90anriZGRF; Thu, 24 Aug 2023 00:36:06 +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 8D8DC8005B; Thu, 24 Aug 2023 00:36:05 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:34:56 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -5.21 X-Spam-Score: -5.21 X-Migadu-Queue-Id: 4376345978 X-TUID: ZjqvCmu0tByg 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 4a0104c253..55f99aae62 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.40.1