SHA256
3
0
forked from pool/texinfo
Dominique Leuenberger 2018-12-19 12:29:14 +00:00 committed by Git OBS Bridge
parent 5ce6dc3eaa
commit 22efbff52d
3 changed files with 41 additions and 8 deletions

View File

@ -9,10 +9,10 @@ This fixes test failures on recent Perl versions.
tp/Texinfo/Parser.pm | 4 ++-- tp/Texinfo/Parser.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm Index: texinfo-6.5/tp/Texinfo/Parser.pm
index dc32ca2..c577aa9 100644 ===================================================================
--- a/tp/Texinfo/Parser.pm --- texinfo-6.5.orig/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm +++ texinfo-6.5/tp/Texinfo/Parser.pm
@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) @@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$)
} }
} elsif ($command eq 'clickstyle') { } elsif ($command eq 'clickstyle') {
@ -27,6 +27,30 @@ index dc32ca2..c577aa9 100644
$has_comment = 1 if (defined($4)); $has_comment = 1 if (defined($4));
} else { } else {
$self->line_error (sprintf($self->__( $self->line_error (sprintf($self->__(
-- Index: texinfo-6.5/tp/Texinfo/Convert/XSParagraph/xspara.c
2.17.0 ===================================================================
--- texinfo-6.5.orig/tp/Texinfo/Convert/XSParagraph/xspara.c
+++ texinfo-6.5/tp/Texinfo/Convert/XSParagraph/xspara.c
@@ -248,6 +248,11 @@ xspara_init (void)
dTHX;
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
+ /* needed due to thread-safe locale handling in newer perls */
+ switch_to_global_locale();
+#endif
+
if (setlocale (LC_CTYPE, "en_US.UTF-8")
|| setlocale (LC_CTYPE, "en_US.utf8"))
goto success;
@@ -320,6 +325,10 @@ failure:
{
success: ;
free (utf8_locale);
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
+ /* needed due to thread-safe locale handling in newer perls */
+ sync_locale();
+#endif
/*
fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
fprintf (stderr, "character encoding is: %s\n",

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Dec 11 11:49:21 UTC 2018 - Dominique Leuenberger <dimstar@opensuse.org>
- Update perl-5.28-fixes.patch: Update locale handling for Perl 5.28.
Perl 5.28 introduced thread-safe locales, where setlocale()
only affects the locale of the current thread. External code
like mbrtowc(3) isn't aware of this thread specific locale,
so we need to explicitly modify the global one instead.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 22 17:59:13 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Thu Nov 22 17:59:13 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -24,7 +24,7 @@ Release: 0
Summary: Tools for creating documentation from texinfo sources Summary: Tools for creating documentation from texinfo sources
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Productivity/Publishing/Texinfo Group: Productivity/Publishing/Texinfo
Url: https://www.gnu.org/software/texinfo/ URL: https://www.gnu.org/software/texinfo/
Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz
Source1: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source1: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz.sig
Source2: %{name}.keyring Source2: %{name}.keyring