[arch-commits] Commit in docbook-xsl/repos/extra-any (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Jul 1 20:29:47 UTC 2017
Date: Saturday, July 1, 2017 @ 20:29:46
Author: arojas
Revision: 299523
archrelease: copy trunk to extra-any
Added:
docbook-xsl/repos/extra-any/765567_non-recursive_string_subst.patch
(from rev 299522, docbook-xsl/trunk/765567_non-recursive_string_subst.patch)
docbook-xsl/repos/extra-any/PKGBUILD
(from rev 299522, docbook-xsl/trunk/PKGBUILD)
docbook-xsl/repos/extra-any/docbook-xsl.install
(from rev 299522, docbook-xsl/trunk/docbook-xsl.install)
Deleted:
docbook-xsl/repos/extra-any/765567_non-recursive_string_subst.patch
docbook-xsl/repos/extra-any/PKGBUILD
docbook-xsl/repos/extra-any/docbook-xsl.install
-----------------------------------------+
765567_non-recursive_string_subst.patch | 60 ++++++++++-----------
PKGBUILD | 78 +++++++++++++---------------
docbook-xsl.install | 82 +++++++++++++++---------------
3 files changed, 107 insertions(+), 113 deletions(-)
Deleted: 765567_non-recursive_string_subst.patch
===================================================================
--- 765567_non-recursive_string_subst.patch 2017-07-01 20:29:16 UTC (rev 299522)
+++ 765567_non-recursive_string_subst.patch 2017-07-01 20:29:46 UTC (rev 299523)
@@ -1,30 +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 at 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
-@@ -10,7 +10,10 @@
- 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 -->
-@@ -56,6 +59,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">
Copied: docbook-xsl/repos/extra-any/765567_non-recursive_string_subst.patch (from rev 299522, docbook-xsl/trunk/765567_non-recursive_string_subst.patch)
===================================================================
--- 765567_non-recursive_string_subst.patch (rev 0)
+++ 765567_non-recursive_string_subst.patch 2017-07-01 20:29:46 UTC (rev 299523)
@@ -0,0 +1,30 @@
+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 at 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
+@@ -10,7 +10,10 @@
+ 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 -->
+@@ -56,6 +59,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">
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-01 20:29:16 UTC (rev 299522)
+++ PKGBUILD 2017-07-01 20:29:46 UTC (rev 299523)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Sean Middleditch <elanthis at awesomeplay.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=docbook-xsl
-pkgver=1.79.1
-pkgrel=2
-pkgdesc='XML stylesheets for Docbook-xml transformations'
-arch=('any')
-license=('custom')
-url='http://docbook.sourceforge.net/'
-depends=('libxml2' 'libxslt' 'docbook-xml')
-install="$pkgname.install"
-source=("https://downloads.sourceforge.net/docbook/${pkgname}-${pkgver}.tar.bz2"
- 765567_non-recursive_string_subst.patch)
-md5sums=('b48cbf929a2ad85e6672f710777ca7bc'
- 'e0dbf66b23121ae789f1930fe90fae0c')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np2 -i ../765567_non-recursive_string_subst.patch
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- _pkgroot=${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}
-
- install -dm755 ${_pkgroot}
- install -m644 VERSION VERSION.xsl ${_pkgroot}
-
- for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \
- manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do
- install -dm755 ${_pkgroot}/${fn}
- install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files
- done
-
- install -dm755 ${pkgdir}/etc/xml
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: docbook-xsl/repos/extra-any/PKGBUILD (from rev 299522, docbook-xsl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-01 20:29:46 UTC (rev 299523)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Sean Middleditch <elanthis at awesomeplay.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=docbook-xsl
+pkgver=1.79.2
+pkgrel=1
+pkgdesc='XML stylesheets for Docbook-xml transformations'
+arch=(any)
+license=(custom)
+url='http://docbook.org/'
+depends=(libxml2 libxslt docbook-xml)
+install="$pkgname.install"
+source=("https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz")
+sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26')
+
+package() {
+ cd $pkgname-$pkgver
+
+ _pkgroot="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
+
+ install -dm755 ${_pkgroot}
+ install -m644 VERSION VERSION.xsl ${_pkgroot}
+
+ for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \
+ manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do
+ install -dm755 ${_pkgroot}/${fn}
+ install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files
+ done
+
+ install -dm755 "$pkgdir"/etc/xml
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: docbook-xsl.install
===================================================================
--- docbook-xsl.install 2017-07-01 20:29:16 UTC (rev 299522)
+++ docbook-xsl.install 2017-07-01 20:29:46 UTC (rev 299523)
@@ -1,41 +0,0 @@
-post_install() {
- if [ ! -f etc/xml/catalog ]; then
- xmlcatalog --noout --create etc/xml/catalog
- fi
- _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-
- 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" \
- "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog &&
-
- 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" \
- "http://docbook.sourceforge.net/release/xsl/current" \
- "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
- etc/xml/catalog
-}
-
-post_upgrade() {
- post_remove $2
- post_install $1
-}
-
-post_remove() {
- _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
- xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
-
- if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then
- xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
- xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
- fi
-}
Copied: docbook-xsl/repos/extra-any/docbook-xsl.install (from rev 299522, docbook-xsl/trunk/docbook-xsl.install)
===================================================================
--- docbook-xsl.install (rev 0)
+++ docbook-xsl.install 2017-07-01 20:29:46 UTC (rev 299523)
@@ -0,0 +1,41 @@
+post_install() {
+ if [ ! -f etc/xml/catalog ]; then
+ xmlcatalog --noout --create etc/xml/catalog
+ fi
+ _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
+
+ 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" \
+ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+ "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ etc/xml/catalog &&
+
+ 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" \
+ "http://docbook.sourceforge.net/release/xsl/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+ etc/xml/catalog
+}
+
+post_upgrade() {
+ post_remove $2
+ post_install $1
+}
+
+post_remove() {
+ _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
+ xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
+
+ if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then
+ xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
+ xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
+ fi
+}
More information about the arch-commits
mailing list