From 5fc6376e6bc1e978970c2f488cb3b2621dc044f5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 31 Jan 2022 09:32:37 +0100 Subject: [PATCH] docbook-mathml: make sure to use the _correct_ `xmlcatalog.exe` The `mingw-w64-libxml2` package brings its own `xmlcatalog.exe`. When running e.g. `pacman -S docbook-xsl` while `MSYSTEM=MINGW64`, this results in an `/etc/xml/catalog` that contains Windows-style paths. Not what we want. Let's make sure that we use the `xmlcatalog.exe` from the `libxml2` package instead. This is a companion to 2aefebb325 (docbook-{xml,xsl}: make sure to use the _correct_ `xmlcatalog.exe`, 2019-11-08). Signed-off-by: Johannes Schindelin --- docbook-mathml/PKGBUILD | 2 +- docbook-mathml/docbook-mathml.install | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docbook-mathml/PKGBUILD b/docbook-mathml/PKGBUILD index 5d9aa2de..93dad228 100644 --- a/docbook-mathml/PKGBUILD +++ b/docbook-mathml/PKGBUILD @@ -3,7 +3,7 @@ pkgname=docbook-mathml pkgver=1.1CR1 -pkgrel=1 +pkgrel=2 pkgdesc="MathML XML scheme" arch=('any') url="https://www.oasis-open.org/docbook/" diff --git a/docbook-mathml/docbook-mathml.install b/docbook-mathml/docbook-mathml.install index b7605297..df77ed1c 100644 --- a/docbook-mathml/docbook-mathml.install +++ b/docbook-mathml/docbook-mathml.install @@ -1,19 +1,19 @@ post_install() { if [ ! -e etc/xml/catalog ]; then - xmlcatalog --noout --create etc/xml/catalog + usr/bin/xmlcatalog --noout --create etc/xml/catalog fi - xmlcatalog --noout --add "public" \ + usr/bin/xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" \ "file:///usr/share/xml/docbook/mathml/1.1CR1/dbmathml.dtd" \ "etc/xml/catalog" - xmlcatalog --noout --add "system" \ + usr/bin/xmlcatalog --noout --add "system" \ "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" \ "file:///usr/share/xml/docbook/mathml/1.1CR1/dbmathml.dtd" \ "etc/xml/catalog" } post_remove() { - xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" etc/xml/catalog - xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" etc/xml/catalog + usr/bin/xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" etc/xml/catalog + usr/bin/xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" etc/xml/catalog }