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

Merge pull request #6199 from catcafeplus/docbbok

Browse Source 
docbook-xsl: refactor
This commit is contained in:
Christoph Reiter
2020-02-15 09:57:12 +01:00
committed by GitHub
parent 2129ddfe83 87c2dcba3f
commit 25bef4655d
5 changed files with 41 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mingw-w64-docbook-xsl/0001-add-back-old-uri-rewrite.patch
View File

@@ -1,6 +1,6 @@
--- docbook-xsl-1.79.2/catalog.xml.orig 2016-12-09 23:46:49.000000000 +0100
+++ docbook-xsl-1.79.2/catalog.xml 2017-09-29 18:35:12.544642100 +0200
@@ -5,4 +5,10 @@
@@ -5,4 +5,8 @@
<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="./"/>
@@ -8,6 +8,4 @@
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl-ns/current/" rewritePrefix="./"/>
+ <rewriteURI uriStartString=" http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.79.2/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.79.2/" rewritePrefix="./"/>
</catalog>

11
mingw-w64-docbook-xsl/0001-nons-add-back-old-uri-rewrite.patch
View File

@@ -1,11 +0,0 @@
--- docbook-xsl-nons-1.79.2/catalog.xml.orig 2019-06-23 05:53:57.009533600 -0400
+++ docbook-xsl-nons-1.79.2/catalog.xml 2019-06-23 05:59:50.537215400 -0400
@@ -5,4 +5,8 @@
<rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl-nons/current/" rewritePrefix="./"/>
<rewriteURI uriStartString="http://cdn.docbook.org/release/xsl-nons/1.79.2/" rewritePrefix="./"/>
<rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl-nons/1.79.2/" rewritePrefix="./"/>
+ <rewriteURI uriStartString=" http://docbook.sourceforge.net/release/xsl-nons/current/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl-nons/current/" rewritePrefix="./"/>
+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl-nons/1.79.2/" rewritePrefix="./"/>
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl-nons/1.79.2/" rewritePrefix="./"/>
</catalog>

12
mingw-w64-docbook-xsl/PKGBUILD
View File

@@ -4,7 +4,7 @@ _realname=docbook-xsl
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.79.2
pkgrel=5
pkgrel=6
pkgdesc='XML stylesheets for Docbook-xml transformations (mingw-w64)'
arch=('any')
license=('custom')
@@ -15,12 +15,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
install=${_realname}-${CARCH}.install
source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F${pkgver}/docbook-xsl{,-nons}-${pkgver}.tar.gz
"0001-add-back-old-uri-rewrite.patch"
"0001-nons-add-back-old-uri-rewrite.patch"
"0002-fix-infinity.patch")
sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26'
'f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e'
'ab61e0a29e6129afd2b6147de6acfe6f4fa3bfabe692553c07684d2c31378290'
'310e01e996e5937cd709f210f11e7f8ebd5a647150041f9de2ce93687c2f19bc'
'1aef3b01c69cce3552614033cdee9d26e4d6b3770cdf7d62b4055f9062adb9c0'
'4a27dd468bb803290b73aeb3a0fde190a1897b97945b59eaf39d8535bb6332a5')
# Helper macros to help make tasks easier #
@@ -52,7 +50,7 @@ prepare() {
cd "${srcdir}"/${_realname}-nons-${pkgver}
msg2 "${_realname}-nons-${pkgver}"
apply_patch_with_msg 0001-nons-add-back-old-uri-rewrite.patch \
apply_patch_with_msg \
0002-fix-infinity.patch
}
@@ -82,11 +80,11 @@ package() {
# sf nons version
${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateURI \
"http://docbook.sourceforge.net/release/xsl/" \
"../../share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml" \
"../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
"${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateSystem \
"http://docbook.sourceforge.net/release/xsl/" \
"../../share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml" \
"../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
"${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
# sf ns version

53
mingw-w64-docbook-xsl/docbook-xsl-i686.install
View File

@@ -8,41 +8,24 @@ _xmlcatalog() {
post_install() {
[[ -f /${MINGW_XML_CATALOG}/catalog ]] || _xmlcatalog --create
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
local x
for x in "delegateSystem" "delegateURI"; do
_xmlcatalog --add $x \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl"
done
}
post_upgrade() {
@@ -52,10 +35,10 @@ post_upgrade() {
post_remove() {
local old=${1%-*}
${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://docbook.sourceforge.net/release/xsl/" ${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://docbook.sourceforge.net/release/xsl-ns/" ${MINGW_XML_CATALOG}/catalog
rm -f ${MINGW_XML_CATALOG}/docbook-xsl.xml
_xmlcatalog --del ../../share/xml/docbook/xsl-stylesheets-$old
_xmlcatalog --del "http://docbook.sourceforge.net/release/xsl/"
_xmlcatalog --del "http://docbook.sourceforge.net/release/xsl-ns/"
rm -f ${MINGW_XML_CATALOG}/docbook-xsl.xml
if (( $(vercmp $1 1.79.2-4) >= 0 )); then
_xmlcatalog --del ../../share/xml/docbook/xsl-stylesheets-$old-nons
fi

51
mingw-w64-docbook-xsl/docbook-xsl-x86_64.install
View File

@@ -8,41 +8,24 @@ _xmlcatalog() {
post_install() {
[[ -f /${MINGW_XML_CATALOG}/catalog ]] || _xmlcatalog --create
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
local x
for x in "delegateSystem" "delegateURI"; do
_xmlcatalog --add $x \
"http://docbook.sourceforge.net/release/xsl/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://docbook.sourceforge.net/release/xsl-ns/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://cdn.docbook.org/release/xsl/" \
"./docbook-xsl"
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl" \
${MINGW_XML_CATALOG}/catalog
_xmlcatalog --add $x \
"http://cdn.docbook.org/release/xsl-nons/" \
"./docbook-xsl"
done
}
post_upgrade() {
@@ -53,8 +36,8 @@ post_upgrade() {
post_remove() {
local old=${1%-*}
_xmlcatalog --del ../../share/xml/docbook/xsl-stylesheets-$old
${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://docbook.sourceforge.net/release/xsl/" ${MINGW_XML_CATALOG}/catalog
${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://docbook.sourceforge.net/release/xsl-ns/" ${MINGW_XML_CATALOG}/catalog
_xmlcatalog --del "http://docbook.sourceforge.net/release/xsl/"
_xmlcatalog --del "http://docbook.sourceforge.net/release/xsl-ns/"
rm -f ${MINGW_XML_CATALOG}/docbook-xsl.xml
if (( $(vercmp $1 1.79.2-4) >= 0 )); then
_xmlcatalog --del ../../share/xml/docbook/xsl-stylesheets-$old-nons