From 484ba819627f7b5ef1d8efe6f2be119e930fe2a0 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Sep 2020 09:42:31 -0700 Subject: [PATCH 1/2] docbook-xsl: update to 1.79.2 Add compatibility patch for 1.79.1. Add patch for broken mandir handling. Update string substitution patch. Adopt package. --- ... => 0001_non-recursive_string_subst.patch} | 20 +++++++++------ .../patches/0002_docbook-xsl-mandir.patch | 25 +++++++++++++++++++ ...Compatibility-with-1.79.1-or-earlier.patch | 22 ++++++++++++++++ srcpkgs/docbook-xsl/template | 16 ++++++------ 4 files changed, 67 insertions(+), 16 deletions(-) rename srcpkgs/docbook-xsl/patches/{non-recursive_string_subst.patch => 0001_non-recursive_string_subst.patch} (60%) create mode 100644 srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch create mode 100644 srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch diff --git a/srcpkgs/docbook-xsl/patches/non-recursive_string_subst.patch b/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch similarity index 60% rename from srcpkgs/docbook-xsl/patches/non-recursive_string_subst.patch rename to srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch index 13193e2f03a..944d18b1a5b 100644 --- a/srcpkgs/docbook-xsl/patches/non-recursive_string_subst.patch +++ b/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch @@ -1,16 +1,20 @@ -Description: use EXSLT "replace" function when available - A recursive implementation of string.subst is problematic, - long strings with many matches will cause stack overflows. -Author: Peter De Wachter +From: Peter De Wachter +Date: Tue, 2 Jun 2020 09:10:39 -0400 +Subject: use EXSLT "replace" function when available + +A recursive implementation of string.subst is problematic, +long strings with many matches will cause stack overflows. + Bug-Debian: https://bugs.debian.org/750593 --- lib/lib.xsl +++ 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/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch b/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch new file mode 100644 index 00000000000..99c81f0c819 --- /dev/null +++ b/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch @@ -0,0 +1,25 @@ +From: Michael Biebl +Date: Wed, 7 Sep 2016 01:37:47 +0200 +Subject: Fix bad .so links in man pages + +Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=%23727251 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831831 + +--- manpages/other.xsl ++++ manpages/other.xsl +@@ -558,7 +558,14 @@ + Note: + (soelim stub) + +- ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch b/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch new file mode 100644 index 00000000000..56ce2cb3d44 --- /dev/null +++ b/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch @@ -0,0 +1,22 @@ +From: Boyuan Yang +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 @@ + + + ++ ++ ++ + diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template index 0d63b09dfbe..5cf9b0d5fc9 100644 --- a/srcpkgs/docbook-xsl/template +++ b/srcpkgs/docbook-xsl/template @@ -1,17 +1,17 @@ # Template file for 'docbook-xsl' pkgname=docbook-xsl -reverts="1.79.2_1" # keep in sync with docbook-xsl-ns -version=1.79.1 -revision=7 -archs=noarch +version=1.79.2 +revision=2 +# at v1.79.2, docbook-xsl was renamed to docbook-xsl-nons +wrksrc="${pkgname}-nons-${version}" depends="xmlcatmgr docbook-xml>=4.2" short_desc="Docbook XSL modular stylesheet" -maintainer="Orphaned " +maintainer="Cameron Nemo " license="MIT" -homepage="http://docbook.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/docbook/${pkgname}-${version}.tar.bz2" -checksum=725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968 +homepage="https://docbook.org/" +distfiles="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${version}/${wrksrc}.tar.bz2" +checksum=ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --" do_install() { From 7cb986e0d08351ca96206d842d0a7f33c0336163 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Sep 2020 09:43:34 -0700 Subject: [PATCH 2/2] 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 +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 @@ + + + ++ ++ ++ + 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 " 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() {