From db553c4a9acac97ec826001f21a4be86fccc382c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Sep 2020 09:43:34 -0700
Subject: [PATCH] docbook-xsl-ns: update to 1.79.2

Add patch for compatibility with 1.79.1.
---
 .../patches/catalog-compat.patch              | 22 +++++++++++++++++++
 srcpkgs/docbook-xsl-ns/template               | 11 +++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch

diff --git a/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch b/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch
new file mode 100644
index 00000000000..de3fb36ba0c
--- /dev/null
+++ b/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch
@@ -0,0 +1,22 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Tue, 2 Jun 2020 22:11:52 -0400
+Subject: catalog.xml: Compatibility with 1.79.1 or earlier
+
+The docbook-xsl project changed the canonical URI since 1.79.2.
+Besides changes made in debian/*.xmlcatalogs files, this patch
+completes the support of the old URI so that existing software
+does not break with changed registered URI.
+
+Forwarded: not-needed
+Last-Update: 2020-06-02
+
+--- catalog.xml
++++ 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-ns/current/" rewritePrefix="./"/>
++  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl-ns/current/" rewritePrefix="./"/>
+ </catalog>
diff --git a/srcpkgs/docbook-xsl-ns/template b/srcpkgs/docbook-xsl-ns/template
index 6c34d9b171b..04b3c274e51 100644
--- a/srcpkgs/docbook-xsl-ns/template
+++ b/srcpkgs/docbook-xsl-ns/template
@@ -1,16 +1,17 @@
 # Template file for 'docbook-xsl-ns'
 pkgname=docbook-xsl-ns
 # keep in sync with docbook-xsl
-version=1.79.1
+version=1.79.2
 revision=1
-archs=noarch
+# at v1.79.2, docbook-xsl-ns was renamed to just docbook-xsl
+wrksrc="docbook-xsl-${version}"
 depends="xmlcatmgr docbook-xml>=4.2"
 short_desc="Docbook XSL modular stylesheet"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
-homepage="http://docbook.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/docbook/${pkgname}-${version}.tar.bz2"
-checksum=36ca9026e05b8985baebd61a23af8ded8e2cf71cc3163b673159c9d78a7b0f9c
+homepage="https://docbook.org/"
+distfiles="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${version}/${wrksrc}.tar.bz2"
+checksum=316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371
 xml_entries="nextCatalog /usr/share/xsl-ns/docbook/catalog.xml --"
 
 do_install() {