rpms/docbook-style-xsl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix gtk-doc multilib failures

Browse Source
This commit is contained in:
David King 2021-01-15 13:25:20 +00:00
parent 76cb8ef323
commit 1e01e15db1
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch Normal file
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>

9
docbook-style-xsl.spec
View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.79.2
Release: 12%{?dist}
Release: 13%{?dist}
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -39,6 +39,9 @@ Patch5: docbook-xsl-list-item-body.patch
Patch6: docbook-xsl-mandir.patch
#Non-recursive string.subst that doesn't kill smb.conf.5 generation
Patch7: docbook-style-xsl-non-recursive-string-subst.patch
#Fix multilib problems with gtk-doc documentation
#https://github.com/docbook/xslt10-stylesheets/issues/54
Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
%description
These XSL stylesheets allow you to transform any DocBook XML document to
@ -59,6 +62,7 @@ popd
%patch5 -p1 -b .listitembody
%patch6 -p1 -b .mandir
%patch7 -p2 -b .non-recursive-subst
%patch8 -p1 -b .gtk-doc-multilib
cp -p %{SOURCE1} Makefile
@ -133,6 +137,9 @@ if [ "$1" = 0 ]; then
fi
%changelog
* Fri Jan 15 2021 David King <amigadave@amigadave.com> - 1.79.2-13
- Fix gtk-doc multilib failures
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild