Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

docbook-{xml,xsl}: make sure to use the _correct_ xmlcatalog.exe

Browse Source 
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.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2019-11-08 10:38:02 +01:00
parent ba37de8022
commit 2aefebb325
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docbook-xml/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=docbook-xml
pkgver=4.5
pkgrel=2
pkgrel=3
pkgdesc="A widely used XML scheme for writing documentation and help"
arch=('any')
url="https://www.oasis-open.org/docbook/"

14
docbook-xml/docbook-xml.install
View File

@ -2,21 +2,21 @@ post_install() {
if [ -e etc/xml/catalog.preserve ]; then
mv etc/xml/catalog.preserve etc/xml/catalog
elif [ ! -e etc/xml/catalog ]; then
xmlcatalog --noout --create etc/xml/catalog
usr/bin/xmlcatalog --noout --create etc/xml/catalog
fi
xmlcatalog --noout --add "delegatePublic" \
usr/bin/xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//ENTITIES DocBook XML" \
"file:///etc/xml/docbook-xml" \
etc/xml/catalog
xmlcatalog --noout --add "delegatePublic" \
usr/bin/xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//DTD DocBook XML" \
"file:///etc/xml/docbook-xml" \
etc/xml/catalog
xmlcatalog --noout --add "delegateSystem" \
usr/bin/xmlcatalog --noout --add "delegateSystem" \
"https://www.oasis-open.org/docbook/" \
"file:///etc/xml/docbook-xml" \
etc/xml/catalog
xmlcatalog --noout --add "delegateURI" \
usr/bin/xmlcatalog --noout --add "delegateURI" \
"https://www.oasis-open.org/docbook/" \
"file:///etc/xml/docbook-xml" \
etc/xml/catalog
@ -26,7 +26,7 @@ post_install() {
# arg 2: the old package version
pre_upgrade() {
if [ $(vercmp $2 4.5) -lt 0 ]; then
xmlcatalog --del "file:///etc/xml/docbook" etc/xml/catalog > etc/xml/catalog.preserve
usr/bin/xmlcatalog --del "file:///etc/xml/docbook" etc/xml/catalog > etc/xml/catalog.preserve
fi
}
@ -38,5 +38,5 @@ post_upgrade() {
}
post_remove() {
xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
usr/bin/xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
}

2
docbook-xsl/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=docbook-xsl
pkgver=1.79.2
pkgrel=1
pkgrel=2
pkgdesc='XML stylesheets for Docbook-xml transformations'
arch=('any')
license=('custom')

14
docbook-xsl/docbook-xsl.install
View File

@ -4,22 +4,22 @@ post_install() {
fi
_NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
xmlcatalog --noout --add "rewriteSystem" \
usr/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
"/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
etc/xml/catalog
xmlcatalog --noout --add "rewriteURI" \
usr/bin/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/${_NEW}" \
"/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
etc/xml/catalog &&
xmlcatalog --noout --add "rewriteSystem" \
usr/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
"/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
etc/xml/catalog &&
xmlcatalog --noout --add "rewriteURI" \
usr/bin/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
"/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
etc/xml/catalog
@ -32,10 +32,10 @@ post_upgrade() {
post_remove() {
_OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
usr/bin/xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
if [ $(vercmp $1 1.78.1-2) -lt 0 ]; then
xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
usr/bin/xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
usr/bin/xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
fi
}