diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-08-20 03:17:56 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-08-20 03:17:56 -0400 |
| commit | 647cfda83b897d3134394a499e51048a1c123389 (patch) | |
| tree | 90bd1d70eb0b9b6f1f45efe48c408ec839e86c08 /gnu/packages/patches/texi2html-document-encoding.patch | |
| parent | cba95006a6129ffe2a29ff9f4ad10549214114a0 (diff) | |
| parent | 667b2508464374a01db3588504b981ec9266a2ea (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/texi2html-document-encoding.patch')
| -rw-r--r-- | gnu/packages/patches/texi2html-document-encoding.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/gnu/packages/patches/texi2html-document-encoding.patch b/gnu/packages/patches/texi2html-document-encoding.patch new file mode 100644 index 0000000000..1469b67fa6 --- /dev/null +++ b/gnu/packages/patches/texi2html-document-encoding.patch @@ -0,0 +1,31 @@ +Patch derived from discussion at https://savannah.nongnu.org/bugs/?37503 + +--- texi2html-5.0/texi2html.pl 2010-06-30 17:01:27.000000000 -0500 ++++ texi2html-5.0/texi2html.pl 2014-07-09 01:17:57.062990582 -0500 +@@ -2589,7 +2589,12 @@ + my $state = shift; + + # FIXME this should be done only once, for @documentencoding +- my $encoding = lc(Texi2HTML::Config::get_conf('DOCUMENT_ENCODING')); ++ my $encoding; ++ my $input_encoding = Texi2HTML::Config::get_conf('documentencoding'); ++ if (defined($input_encoding)) ++ { ++ $encoding = lc($input_encoding); ++ } + if (defined($encoding) and $encoding ne '' and exists($Texi2HTML::Config::t2h_encoding_aliases{$encoding})) + { + $encoding = $Texi2HTML::Config::t2h_encoding_aliases{$encoding}; + +Fix failures in test/encodings. + +--- texi2html-5.0/texi2html.pl 2014-07-09 01:22:06.000000000 -0500 ++++ texi2html-5.0/texi2html.pl 2014-07-10 23:23:47.182097602 -0500 +@@ -53,6 +53,7 @@ + # for translations + #use encoding 'utf8'; + #use utf8; ++binmode STDERR, ':encoding(utf8)'; + + # + # According to |