diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff deleted file mode 100644 index 67a55da427..0000000000 --- a/meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | Upstream-Status:Inappropriate [debian patch] | ||
2 | |||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Subject: LC_NUMERIC documentation fixes | ||
5 | Bug-Debian: http://bugs.debian.org/379329 | ||
6 | Bug: http://rt.perl.org/rt3/Ticket/Display.html?id=78452 | ||
7 | Origin: upstream, http://perl5.git.perl.org/perl.git/commit/903eb63f7d8d47a38971a8e9af7201b9927882cf | ||
8 | |||
9 | LC_NUMERIC documentation updates fixing two errors: | ||
10 | |||
11 | - the early parts of perllocale.pod still say printf() uses LC_NUMERIC | ||
12 | with just 'use locale' when actually a POSIX::setlocale() call is | ||
13 | also needed | ||
14 | |||
15 | - format() hasn't used LC_NUMERIC unconditionally since 5.005_03 | ||
16 | (commit 097ee67dff1c60f201bc09435bc6eaeeafcd8123). | ||
17 | |||
18 | Test cases from the upstream commit dropped for the sake of simplicity. | ||
19 | |||
20 | --- | ||
21 | pod/perlform.pod | 20 ++++++++------------ | ||
22 | pod/perllocale.pod | 15 ++++++--------- | ||
23 | 2 files changed, 14 insertions(+), 21 deletions(-) | ||
24 | |||
25 | diff --git a/pod/perlform.pod b/pod/perlform.pod | ||
26 | index 3cfa1b7..df0f0a1 100644 | ||
27 | --- a/pod/perlform.pod | ||
28 | +++ b/pod/perlform.pod | ||
29 | @@ -166,9 +166,9 @@ token on the first line. If an expression evaluates to a number with a | ||
30 | decimal part, and if the corresponding picture specifies that the decimal | ||
31 | part should appear in the output (that is, any picture except multiple "#" | ||
32 | characters B<without> an embedded "."), the character used for the decimal | ||
33 | -point is B<always> determined by the current LC_NUMERIC locale. This | ||
34 | -means that, if, for example, the run-time environment happens to specify a | ||
35 | -German locale, "," will be used instead of the default ".". See | ||
36 | +point is determined by the current LC_NUMERIC locale if C<use locale> is in | ||
37 | +effect. This means that, if, for example, the run-time environment happens | ||
38 | +to specify a German locale, "," will be used instead of the default ".". See | ||
39 | L<perllocale> and L<"WARNINGS"> for more information. | ||
40 | |||
41 | |||
42 | @@ -442,15 +442,11 @@ Lexical variables (declared with "my") are not visible within a | ||
43 | format unless the format is declared within the scope of the lexical | ||
44 | variable. (They weren't visible at all before version 5.001.) | ||
45 | |||
46 | -Formats are the only part of Perl that unconditionally use information | ||
47 | -from a program's locale; if a program's environment specifies an | ||
48 | -LC_NUMERIC locale, it is always used to specify the decimal point | ||
49 | -character in formatted output. Perl ignores all other aspects of locale | ||
50 | -handling unless the C<use locale> pragma is in effect. Formatted output | ||
51 | -cannot be controlled by C<use locale> because the pragma is tied to the | ||
52 | -block structure of the program, and, for historical reasons, formats | ||
53 | -exist outside that block structure. See L<perllocale> for further | ||
54 | -discussion of locale handling. | ||
55 | +If a program's environment specifies an LC_NUMERIC locale and C<use | ||
56 | +locale> is in effect when the format is declared, the locale is used | ||
57 | +to specify the decimal point character in formatted output. Formatted | ||
58 | +output cannot be controlled by C<use locale> at the time when write() | ||
59 | +is called. See L<perllocale> for further discussion of locale handling. | ||
60 | |||
61 | Within strings that are to be displayed in a fixed length text field, | ||
62 | each control character is substituted by a space. (But remember the | ||
63 | diff --git a/pod/perllocale.pod b/pod/perllocale.pod | ||
64 | index 0dbabe7..0bec423 100644 | ||
65 | --- a/pod/perllocale.pod | ||
66 | +++ b/pod/perllocale.pod | ||
67 | @@ -115,8 +115,7 @@ ucfirst(), and lcfirst()) use C<LC_CTYPE> | ||
68 | |||
69 | =item * | ||
70 | |||
71 | -B<The formatting functions> (printf(), sprintf() and write()) use | ||
72 | -C<LC_NUMERIC> | ||
73 | +B<Format declarations> (format()) use C<LC_NUMERIC> | ||
74 | |||
75 | =item * | ||
76 | |||
77 | @@ -967,13 +966,11 @@ system's implementation of the locale system than by Perl. | ||
78 | |||
79 | =head2 write() and LC_NUMERIC | ||
80 | |||
81 | -Formats are the only part of Perl that unconditionally use information | ||
82 | -from a program's locale; if a program's environment specifies an | ||
83 | -LC_NUMERIC locale, it is always used to specify the decimal point | ||
84 | -character in formatted output. Formatted output cannot be controlled by | ||
85 | -C<use locale> because the pragma is tied to the block structure of the | ||
86 | -program, and, for historical reasons, formats exist outside that block | ||
87 | -structure. | ||
88 | +If a program's environment specifies an LC_NUMERIC locale and C<use | ||
89 | +locale> is in effect when the format is declared, the locale is used | ||
90 | +to specify the decimal point character in formatted output. Formatted | ||
91 | +output cannot be controlled by C<use locale> at the time when write() | ||
92 | +is called. | ||
93 | |||
94 | =head2 Freely available locale definitions | ||
95 | |||
96 | -- | ||
97 | tg: (a508b62..) fixes/lc-numeric-docs (depends on: upstream) | ||