all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob b6895dd0d3b59b0fba1ceb140f9d33438805ed5c 1921 bytes (raw)
name: gnu/packages/patches/docbook2x-filename-handling.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
## 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 ...

debug log:

solving b6895dd0d3 ...
found b6895dd0d3 in https://yhetil.org/guix/b12e2391d88de365b8104a0fc9f0a35a6530b5fb.1692830149.git.mirai@makinata.eu/ ||
	https://yhetil.org/guix/c295546b3f9c6f11757b1653de7aa2862b82b9d9.1695478390.git.mirai@makinata.eu/

applying [1/1] https://yhetil.org/guix/b12e2391d88de365b8104a0fc9f0a35a6530b5fb.1692830149.git.mirai@makinata.eu/
diff --git a/gnu/packages/patches/docbook2x-filename-handling.patch b/gnu/packages/patches/docbook2x-filename-handling.patch
new file mode 100644
index 0000000000..b6895dd0d3

1:26: trailing whitespace.
 
1:32: trailing whitespace.
 
1:33: trailing whitespace.
 
1:39: trailing whitespace.
 
1:46: trailing whitespace.
 
Checking patch gnu/packages/patches/docbook2x-filename-handling.patch...
Applied patch gnu/packages/patches/docbook2x-filename-handling.patch cleanly.
warning: 5 lines add whitespace errors.

skipping https://yhetil.org/guix/c295546b3f9c6f11757b1653de7aa2862b82b9d9.1695478390.git.mirai@makinata.eu/ for b6895dd0d3
index at:
100644 b6895dd0d3b59b0fba1ceb140f9d33438805ed5c	gnu/packages/patches/docbook2x-filename-handling.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.