diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
| commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
| tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /sys-apps/texinfo/files | |
| parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) | |
gentoo resync : 08.06.2019
Diffstat (limited to 'sys-apps/texinfo/files')
| -rw-r--r-- | sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch | 28 | ||||
| -rw-r--r-- | sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch | 37 |
2 files changed, 0 insertions, 65 deletions
diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch deleted file mode 100644 index 72f1288393ac..000000000000 --- a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch +++ /dev/null @@ -1,28 +0,0 @@ -From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001 -From: Gavin Smith <gavinsmith0123@gmail.com> -Date: Fri, 13 Jul 2018 15:31:28 +0000 -Subject: [PATCH] escape braces in regex - -git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007 39fee189-59d7-47db-b5d4-205258b72aed - -diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm -index ba1cd423d..b5eece680 100644 ---- a/tp/Texinfo/Parser.pm -+++ b/tp/Texinfo/Parser.pm -@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( --- -2.20.1 - diff --git a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch deleted file mode 100644 index 2d33abe78c72..000000000000 --- a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001 -From: Gavin Smith <gavinsmith0123@gmail.com> -Date: Fri, 13 Jul 2018 15:39:29 +0000 -Subject: [PATCH] perl 5.28 thread-safe locales - -git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008 39fee189-59d7-47db-b5d4-205258b72aed - -diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c -index 51eea4a30..f2d6d1ccd 100644 ---- a/tp/Texinfo/Convert/XSParagraph/xspara.c -+++ b/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", --- -2.20.1 - |