amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: docbook2x: Import patches from debian.

Browse source 
* gnu/packages/docbook.scm (docbook2x)[source]: Import patches from
debian. Prefer patching in source over 'patch-sources phase. Drop docbook-xml
workaround.
[arguments]<#:phases>: Drop 'patch-sources.
[inputs]: Move after arguments. Remove docbook-xml-4.5.
[natine-inputs]: Add autoconf, automake and libtool.
* gnu/packages/patches/docbook2x-filename-handling.patch: New file.
* gnu/packages/patches/docbook2x-fix-synopsis.patch: Ditto.
* gnu/packages/patches/docbook2x-manpage-typo.patch: Ditto.
* gnu/packages/patches/docbook2x-preprocessor-declaration.patch: Ditto.
* gnu/packages/patches/docbook2x-static-datadir-evaluation.patch: Ditto.
* gnu/local.mk: Register it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Bruno Victal 2023-10-09 21:06:00 +01:00 • committed by Ludovic Courtès
parent 5b6c9ca520
commit a373462233
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
7 changed files with 241 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/patches/docbook2x-filename-handling.patch Normal file
View file

@ -0,0 +1,44 @@
# Source: <https://sources.debian.org/patches/docbook2x/0.8.8-18/03_fix_420153_filename_whitespace_handling.patch/>
## 03_fix_420153_filename_whitespace_handling.dpatch by
## Daniel Leidert (dale) <daniel.leidert@wgdd.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Peter Eisentraut reported a regression in the whitespace handling of
## DP: refentrytitle content during filename creation:
## DP: http://bugs.debian.org/420153. The problem is, that upstream first
## DP: replaces all spaces (but not linebreaks btw) with underlines and then
## DP: it tries to normalize the result. This means, that a linebreak with
## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
## DP: So what we basically do in this patch is, that we first normalize the
## DP: refentrytitle and then replace any spaces left with underlines.
Edit by Bruno Victal <mirai@makinata.eu>:
Removed dpatch lines.
--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200
+++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200
@@ -30,7 +30,7 @@
<xsl:template name="manpage-filename">
<xsl:param name="filename" />
- <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />
+ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />
</xsl:template>
--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200
+++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200
@@ -38,7 +38,11 @@
<xsl:template name="refentry-filename">
<xsl:param name="title" />
- <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />
+ <xsl:variable name="title2">
+ <xsl:call-template name="manpage-filename">
+ <xsl:with-param name="filename" select="$title" />
+ </xsl:call-template>
+ </xsl:variable>
<!-- not using gentext here since man page names tend not to have
accented chars / non-Latin chars ...