--- Begin Message ---
Subject: |
[PATCH core-updates 0/9] Modernize and fix docbook-xml |
Date: |
Mon, 23 Jan 2023 03:31:16 +0000 |
This patch-series modernizes docbook-xml package definitions and
properly patches the catalog.xml paths using XSLT.
I've used XSLT here as it seems easier (and better documented)
to perform XML operations with it. I did a small prototype with
(sxml transforms) but due to guile-bug #20339, it's impossible to go
from sxml->xml, ruling it out from being a suitable replacement for XSLT.
The situation for docbook-xml-4.1.2 could be considered extraordinary
since it's the only package that doesn't come with a catalog.xml file,
requiring a pre-built one to be used. (It can be generated from source,
by implementing a (PEG) parser for SGML catalogs but this seems
unnecessary for a file that is unlikely to see any changes.)
With these changes, it's no longer required for packages to do
substitute* or other workarounds to coerce docbook-xml
to play nicely, libxml2 will automatically find the DTDs
through its native-search-path. (XML_CATALOG_FILES variable)
A good follow-up to this patch-series would be to search and destroy
the workarounds currently employed by docbook-xml dependant packages
to discourage cargo-culting redundant procedures.
Bruno Victal (9):
gnu: docbook-xml: Use copy-build-system.
gnu: docbook-xml-4.1.2: Adapt to copy-build-system.
gnu: docbook-xml: Adapt to copy-build-system.
gnu: docbook-xml-4.4: Adapt to copy-build-system.
gnu: docbook-xml-4.3: Adapt to copy-build-system.
gnu: docbook-xml-4.2: Adapt to copy-build-system.
gnu: docbook-xml: Fix permissions.
gnu: docbook-xml: Use XSLT to patch catalog.xml.
gnu: docbook-xml-4.1.2: Add missing catalog.xml.
.../xml/docbook-xml/catalog-4.1.2.xml | 31 +++++
gnu/packages/aux-files/xml/patch-uri.xsl | 24 ++++
gnu/packages/docbook.scm | 127 +++++++++---------
3 files changed, 116 insertions(+), 66 deletions(-)
create mode 100644 gnu/packages/aux-files/xml/docbook-xml/catalog-4.1.2.xml
create mode 100644 gnu/packages/aux-files/xml/patch-uri.xsl
base-commit: ca124b098dcc7ce7898df10faf9986f44a14e0a1
--
2.38.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#61015: [PATCH core-updates 0/9] Modernize and fix docbook-xml |
Date: |
Fri, 21 Apr 2023 00:45:37 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hi,
Bruno Victal <mirai@makinata.eu> writes:
> * gnu/packages/docbook.scm
> (docbook-xml-5)[build-system]: Switch to copy-build-system.
> [source][arguments]: Adapt to copy-build-system.
> (docbook-xml)[arguments]: Remove.
> [source]: Switch to url-fetch/zipbomb.
> (docbook-xml-4.4)[source]: Switch to url-fetch/zipbomb.
> (docbook-xml-4.3)[source]: Switch to url-fetch/zipbomb.
> (docbook-xml-4.2)[source]: Switch to url-fetch/zipbomb.
> (docbook-xml-4.1.2)[arguments]: Remove.
> [source]: Switch to url-fetch/zipbomb.
Applied to core-updates, along multiple follow-up that cleaned things
up. Thank you!
--
Thanks,
Maxim
--- End Message ---