commit 23a2e91b53b6bb6c48d8a080f67c151e300e8e26 Author: John McQuah <jmcquah@disroot.org> Date: Sun Jan 22 20:50:09 2023 -0500 docbook-xsl: update source url, delete unneeded patch diff --git a/docbook-xsl/.footprint b/docbook-xsl/.footprint index d8e93c5a2..a69caca51 100644 --- a/docbook-xsl/.footprint +++ b/docbook-xsl/.footprint @@ -1,11 +1,5 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/ --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.html --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.pdf --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.txt --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.xml drwxr-xr-x root/root usr/share/xml/ drwxr-xr-x root/root usr/share/xml/docbook/ lrwxrwxrwx root/root usr/share/xml/docbook/xsl-stylesheets -> xsl-stylesheets-1.79.2 @@ -122,24 +116,24 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/eclipse/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/eclipse/profile-eclipse.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/dbtoepub +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/dbtoepub drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/docbook.rb +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/docbook.rb drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/xslt/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/xslt/obfuscate.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/docbook.xsl -drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/LICENSE.txt --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/NOTICE.txt --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/build.xml --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/docbook.py --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/lucene-analyzers-3.0.0.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/lucene-core-3.0.0.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/saxon65.jar --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/tagsoup-1.2.1.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/webhelpindexer.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/xalan27.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/xslt.py +drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/ +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/build.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/chunkfast.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/docbook-epub.css.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/epub3-chunk-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/epub3-element-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/profile-chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/titlepage.templates.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/titlepage.templates.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/admon.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/annotations.xsl @@ -434,13 +428,13 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/refentry.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/synop.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/table.xsl --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/tbl.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/tbl.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/utility.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.notitle.enabled.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.title.properties.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/activate.external.olinks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/activate.external.olinks.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/active.toc.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ade.extensions.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/admon.graphics.extension.xml @@ -462,7 +456,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/article.appendix.title.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/author.othername.in.middle.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolayout-file.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolink.index.see.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolink.index.see.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autotoc.label.in.hyperlink.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autotoc.label.separator.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/axf.extensions.xml @@ -623,7 +617,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/footnote.sep.leader.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/fop.extensions.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/fop1.extensions.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/force.blank.pages.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/force.blank.pages.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.object.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.procedures.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.title.placement.xml @@ -1049,7 +1043,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/sequential.links.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/shade.verbatim.style.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/shade.verbatim.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.bookmarks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.bookmarks.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.comments.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.foil.number.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.revisionflag.xml @@ -1194,7 +1188,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.title-page.separator.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.with.number.and.title.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xsl1.1.bookmarks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xsl1.1.bookmarks.xml drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/profile-mode.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/profile.xsl @@ -1402,7 +1396,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/h -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/help/help.pt-br.html drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/.htaccess --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js.gz drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/styles/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/styles/.htaccess @@ -1604,9 +1598,23 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/synop.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/table.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/task.xsl --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/toc.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/verbatim.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/xref.xsl +drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/ +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/build.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/chunkfast.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/docbook.css.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/html5-chunk-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/html5-element-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/onechunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/profile-chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml-profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml2xhtml5.xsl diff --git a/docbook-xsl/.signature b/docbook-xsl/.signature index 75f2af173..836db98ca 100644 --- a/docbook-xsl/.signature +++ b/docbook-xsl/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34vjglquuTEL6NRsDnHB+tvGb9lEmkW2r+RqpVKyBAehZaIEk/VIA3vp1dkyjMNlhczWwxrtLCNCj28PGGRMIAU= -SHA256 (Pkgfile) = 5e91bdeecf74272ba184048a52c800b7b30d0bfc243d71584e6261d0645a4ccf -SHA256 (.footprint) = f558ba108c1e62c7a61d2af2f0fc2671bcd3ed1fac23251d3a71b1336f7a5a91 -SHA256 (docbook-xsl-1.79.2.tar.bz2) = 316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371 -SHA256 (non-recursive-string-subst.patch) = 193ec26dcb37bdf12037ed4ea98d68bd550500c8e96b719685d76d7096c3f9b3 +RWSagIOpLGJF3xATi6j1sah0A0ceVVzjzVGl1dbrCNbNXWCw/xmayCOg/gdHYVwYdnh/1r5Ic7xtyJra6oER2fEcDrIop1bP3gg= +SHA256 (Pkgfile) = 9d3b3d94f095203d26a5b066eee9c23f1e67a1bbb547db91c573178d30a920b1 +SHA256 (.footprint) = 4b6ed45e648412c75a129eafd09546c50576f7c56ed35cfac9b37a54b80f942f +SHA256 (docbook-xsl-nons-1.79.2.tar.bz2) = ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 diff --git a/docbook-xsl/Pkgfile b/docbook-xsl/Pkgfile index 5e0f033bd..ec3685cea 100644 --- a/docbook-xsl/Pkgfile +++ b/docbook-xsl/Pkgfile @@ -1,36 +1,28 @@ # Description: A collection of XSL stylesheets that are useful for performing transformations on XML DocBook files. # URL: http://docbook.sourceforge.net/ -# Maintainer: Matt Housh, jaeger at crux dot ninja +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libxslt docbook-xml name=docbook-xsl version=1.79.2 -release=2 -source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/$ver... - non-recursive-string-subst.patch) +release=3 +source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/$ver...) build() { - cd $name-$version + cd $name-nons-$version - patch -Np2 -i $SRC/non-recursive-string-subst.patch install -v -m 0755 -d $PKG/usr/share/xml/docbook/xsl-stylesheets-$version cp -v -R \ - VERSION common eclipse epub extensions fo \ + VERSION common eclipse epub epub3 fo \ highlighting html htmlhelp images javahelp lib manpages \ params profiling roundtrip slides template tests tools website \ - xhtml xhtml-1_1 \ + xhtml xhtml-1_1 xhtml5 \ $PKG/usr/share/xml/docbook/xsl-stylesheets-$version ln -s VERSION $PKG/usr/share/xml/docbook/xsl-stylesheets-${version}/VERSION.xsl ln -sf xsl-stylesheets-$version $PKG/usr/share/xml/docbook/xsl-stylesheets - install -v -m 0644 -D README \ - $PKG/usr/share/doc/docbook-xsl-$version/README.txt - - install -v -m 0755 RELEASE-NOTES* NEWS* \ - $PKG/usr/share/doc/docbook-xsl-$version - find $PKG \( -name "NEWS*" -o -name "README*" -o -name "ChangeLog*" \) -delete } diff --git a/docbook-xsl/non-recursive-string-subst.patch b/docbook-xsl/non-recursive-string-subst.patch deleted file mode 100644 index ae845ad00..000000000 --- a/docbook-xsl/non-recursive-string-subst.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 <pdewacht@gmail.com> -Bug-Debian: https://bugs.debian.org/750593 - ---- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl -+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl -@@ -6,7 +6,11 @@ - - This module implements DTD-independent functions - -- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -+ ******************************************************************** --> -+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:str="http://exslt.org/strings" -+ exclude-result-prefixes="str" -+ version="1.0"> - - <xsl:template name="dot.count"> - <!-- Returns the number of "." characters in a string --> -@@ -52,6 +56,9 @@ - <xsl:param name="replacement"/> - - <xsl:choose> -+ <xsl:when test="function-available('str:replace')"> -+ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/> -+ </xsl:when> - <xsl:when test="contains($string, $target)"> - <xsl:variable name="rest"> - <xsl:call-template name="string.subst"> - diff --git a/docbook-xsl/post-install b/docbook-xsl/post-install index 2779cfa6a..691b0a504 100755 --- a/docbook-xsl/post-install +++ b/docbook-xsl/post-install @@ -4,13 +4,8 @@ PREV=1.79.1 CUR=1.79.2 CATALOG=/etc/xml/catalog -if [ ! -d /etc/xml ]; then - install -m 0755 -d /etc/xml -fi - -if [ ! -f ${CATALOG} ]; then - xmlcatalog --noout --create ${CATALOG} -fi +[ -d /etc/xml ] || install -m 0755 -d /etc/xml +[ -f ${CATALOG} ] || xmlcatalog --noout --create ${CATALOG} xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${PREV}" \ ${CATALOG}