summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/docbook-xsl-support-old-url.patch
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-06-14 17:21:23 +0200
committerMarius Bakke <marius@gnu.org>2020-06-14 17:21:23 +0200
commit6268aa31849fa2bcd6594a3ef75260d5d9d21705 (patch)
tree4bdfc8352a308b933d600181273e281151896780 /gnu/packages/patches/docbook-xsl-support-old-url.patch
parent4193095e18b602705df94e38a8d60ef1fe380e49 (diff)
downloadguix-patches-6268aa31849fa2bcd6594a3ef75260d5d9d21705.tar
guix-patches-6268aa31849fa2bcd6594a3ef75260d5d9d21705.tar.gz
gnu: docbook-xsl: Update to 1.79.2.
* gnu/packages/patches/docbook-xsl-support-old-url.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: Adjust URL and context. * gnu/packages/docbook.scm (docbook-xsl): Update to 1.79.2. [source](uri): Adjust for new download location.
Diffstat (limited to 'gnu/packages/patches/docbook-xsl-support-old-url.patch')
-rw-r--r--gnu/packages/patches/docbook-xsl-support-old-url.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/docbook-xsl-support-old-url.patch b/gnu/packages/patches/docbook-xsl-support-old-url.patch
new file mode 100644
index 0000000000..5b7dda458f
--- /dev/null
+++ b/gnu/packages/patches/docbook-xsl-support-old-url.patch
@@ -0,0 +1,17 @@
+Docbook 1.79.2 makes very few changes apart from changing the canonical URL
+to cdn.docbook.org. This patch adds support for the previous URL to avoid
+breaking packages that still use that.
+
+Adapted from Debian:
+https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/0005-catalog.xml-Compatibility-with-1.79.1-or-earlier.patch
+
+--- a/catalog.xml
++++ b/catalog.xml
+@@ -5,4 +5,7 @@
+ <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/current/" rewritePrefix="./"/>
+ <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
++ <!-- Also support old URI of v1.79.1 or earlier -->
++ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
++ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+ </catalog>