[arch-commits] Commit in docbook-xsl/trunk (2 files)

[Antonio Rojas]

    Date: Wednesday, July 5, 2017 @ 17:30:32
  Author: arojas
Revision: 299701

Restore patch (FS#54694)

Modified:
  docbook-xsl/trunk/765567_non-recursive_string_subst.patch
  docbook-xsl/trunk/PKGBUILD

-----------------------------------------+
 765567_non-recursive_string_subst.patch |   10 ++++++----
 PKGBUILD                                |   13 ++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

Modified: 765567_non-recursive_string_subst.patch
===================================================================
--- 765567_non-recursive_string_subst.patch	2017-07-05 17:14:16 UTC (rev 299700)
+++ 765567_non-recursive_string_subst.patch	2017-07-05 17:30:32 UTC (rev 299701)
@@ -6,11 +6,12 @@
 
 --- 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 @@
+@@ -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" version="1.0">
++     ******************************************************************** -->
 +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 +                xmlns:str="http://exslt.org/strings"
 +                exclude-result-prefixes="str"
@@ -18,7 +19,7 @@
  
  <xsl:template name="dot.count">
    <!-- Returns the number of "." characters in a string -->
-@@ -56,6 +59,9 @@
+@@ -52,6 +56,9 @@
    <xsl:param name="replacement"/>
  
    <xsl:choose>
@@ -28,3 +29,4 @@
      <xsl:when test="contains($string, $target)">
        <xsl:variable name="rest">
          <xsl:call-template name="string.subst">
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-05 17:14:16 UTC (rev 299700)
+++ PKGBUILD	2017-07-05 17:30:32 UTC (rev 299701)
@@ -7,7 +7,7 @@
 
 pkgname=docbook-xsl
 pkgver=1.79.2
-pkgrel=1
+pkgrel=2
 pkgdesc='XML stylesheets for Docbook-xml transformations'
 arch=(any)
 license=(custom)
@@ -14,9 +14,16 @@
 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')
+source=("https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz"
+        765567_non-recursive_string_subst.patch)
+sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26'
+            '193ec26dcb37bdf12037ed4ea98d68bd550500c8e96b719685d76d7096c3f9b3')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np2 -i ../765567_non-recursive_string_subst.patch
+}
+
 package() {
   cd $pkgname-$pkgver