!2 add patch 8

From: @dillon_chen 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-06-20 02:26:08 +00:00 committed by Gitee
commit a016209d03
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 80 additions and 1 deletions

View File

@ -0,0 +1,74 @@
diff -urN docbook-xsl-nons-1.79.2/fo/autoidx.xsl docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl
--- docbook-xsl-nons-1.79.2/fo/autoidx.xsl 2016-12-09 22:47:31.000000000 +0000
+++ docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl 2021-01-15 13:20:25.144862117 +0000
@@ -295,7 +295,8 @@
<fo:block>
<xsl:if test="$autolink.index.see != 0">
<xsl:attribute name="id">
- <xsl:value-of select="concat('ientry-', generate-id())"/>
+ <xsl:text>ientry-</xsl:text>
+ <xsl:call-template name="object.id"/>
</xsl:attribute>
</xsl:if>
<xsl:if test="$axf.extensions != 0">
@@ -790,7 +791,10 @@
<xsl:variable name="linkend">
<xsl:if test="$seetarget">
- <xsl:value-of select="concat('ientry-', generate-id($seetarget))"/>
+ <xsl:text>ientry-</xsl:text>
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$seetarget"/>
+ </xsl:call-template>
</xsl:if>
</xsl:variable>
@@ -852,7 +856,10 @@
<xsl:variable name="linkend">
<xsl:if test="$seealsotarget">
- <xsl:value-of select="concat('ientry-', generate-id($seealsotarget))"/>
+ <xsl:text>ientry-</xsl:text>
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$seealsotarget"/>
+ </xsl:call-template>
</xsl:if>
</xsl:variable>
diff -urN docbook-xsl-nons-1.79.2/html/autoidx.xsl docbook-xsl-nons-1.79.2.new/html/autoidx.xsl
--- docbook-xsl-nons-1.79.2/html/autoidx.xsl 2016-12-09 22:47:30.000000000 +0000
+++ docbook-xsl-nons-1.79.2.new/html/autoidx.xsl 2021-01-15 13:20:25.145862128 +0000
@@ -306,7 +306,8 @@
<xsl:if test="$autolink.index.see != 0">
<!-- add internal id attribute to form see and seealso links -->
<xsl:attribute name="id">
- <xsl:value-of select="concat('ientry-', generate-id())"/>
+ <xsl:text>ientry-</xsl:text>
+ <xsl:call-template name="object.id"/>
</xsl:attribute>
</xsl:if>
<xsl:for-each select="$refs/primary">
@@ -729,7 +730,10 @@
<xsl:variable name="linkend">
<xsl:if test="$seetarget">
- <xsl:value-of select="concat('#ientry-', generate-id($seetarget))"/>
+ <xsl:text>#ientry-</xsl:text>
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$seetarget"/>
+ </xsl:call-template>
</xsl:if>
</xsl:variable>
@@ -788,7 +792,10 @@
<xsl:variable name="linkend">
<xsl:if test="$seealsotarget">
- <xsl:value-of select="concat('#ientry-', generate-id($seealsotarget))"/>
+ <xsl:text>#ientry-</xsl:text>
+ <xsl:call-template name="object.id">
+ <xsl:with-param name="object" select="$seealsotarget"/>
+ </xsl:call-template>
</xsl:if>
</xsl:variable>

View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.79.2
Release: 9
Release: 10
Summary: XSLT 1.0 Stylesheets for DocBook
License: DMIT
URL: https://github.com/docbook/xslt10-stylesheets
@ -23,6 +23,7 @@ Patch4: docbook-xsl-non-constant-expressions.patch
Patch5: docbook-xsl-list-item-body.patch
Patch6: docbook-xsl-mandir.patch
Patch7: docbook-style-xsl-non-recursive-string-subst.patch
Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
%description
These are XSL stylesheets for transforming DocBook XML document
@ -42,6 +43,7 @@ cp -p %{SOURCE2} Makefile
%patch5 -p1 -b .listitembody
%patch6 -p1 -b .mandir
%patch7 -p1 -b .non-recursive-subst
%patch8 -p1 -b .gtk-doc-multilib
for fhtml in $(find ./doc -name '*.html' -type f)
do
@ -96,5 +98,8 @@ fi
%{_datadir}/sgml/docbook/xsl-stylesheets*
%changelog
* Fri Jun 17 2022 dillon chen <dillon.chen@gmail.com> - 1.79.2-10
- add patch8
* Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.79.2-9
- Package init