From 6268aa31849fa2bcd6594a3ef75260d5d9d21705 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jun 2020 17:21:23 +0200 Subject: 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. --- gnu/local.mk | 1 + gnu/packages/docbook.scm | 12 +++++++----- .../patches/docbook-xsl-nonrecursive-string-subst.patch | 11 ++++++----- gnu/packages/patches/docbook-xsl-support-old-url.patch | 17 +++++++++++++++++ 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/docbook-xsl-support-old-url.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 85551b1585..c6e66091af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -869,6 +869,7 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ + %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/docker-fix-tests.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 7221dd8fd9..fe0b26e788 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -133,15 +133,17 @@ by no means limited to these applications.) This package provides XML DTDs.") (define-public docbook-xsl (package (name "docbook-xsl") - (version "1.79.1") + (version "1.79.2") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" - version "/docbook-xsl-" version ".tar.bz2")) - (patches (search-patches "docbook-xsl-nonrecursive-string-subst.patch")) + (uri (string-append "https://github.com/docbook/xslt10-stylesheets" + "/releases/download/release%2F" version + "/docbook-xsl-" version ".tar.bz2")) + (patches (search-patches "docbook-xsl-support-old-url.patch" + "docbook-xsl-nonrecursive-string-subst.patch")) (sha256 (base32 - "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")) + "0wd33z41kdsybyx3ay21w6bdlmgpd9kyn3mr5y520lsf8km28r9i")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch index 4199dd18a5..fed4b76429 100644 --- a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch +++ b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch @@ -5,7 +5,7 @@ https://bugzilla.samba.org/show_bug.cgi?id=9515 https://bugzilla.gnome.org/show_bug.cgi?id=736077 (for xsltproc) Patch copied from Debian: -https://anonscm.debian.org/cgit/collab-maint/docbook-xsl.git/tree/debian/patches/765567_non-recursive_string_subst.patch +https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/765567_non-recursive_string_subst.patch Description: use EXSLT "replace" function when available A recursive implementation of string.subst is problematic, @@ -15,11 +15,12 @@ Bug-Debian: https://bugs.debian.org/750593 --- a/lib/lib.xsl +++ b/lib/lib.xsl -@@ -10,7 +10,10 @@ +@@ -6,7 +6,11 @@ + This module implements DTD-independent functions - ******************************************************************** --> -- +- ******************************************************************** --> ++ ******************************************************************** --> + -@@ -56,6 +59,9 @@ +@@ -52,6 +56,9 @@ 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 @@ + + + ++ ++ ++ + -- cgit 1.4.1