From 8b77446d283663c2fb6f6b99de5e02ea137b64bc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 10 Apr 2019 13:41:23 +0200 Subject: [PATCH] texinfo: upstream patch for newer perl. --- ...ft-braces-in-regexps-deprecated-sinc.patch | 32 +++++++++++++++++++ sys-apps/texinfo/texinfo-6.5.recipe | 5 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 sys-apps/texinfo/patches/0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch diff --git a/sys-apps/texinfo/patches/0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch b/sys-apps/texinfo/patches/0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch new file mode 100644 index 000000000..ac56456a5 --- /dev/null +++ b/sys-apps/texinfo/patches/0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch @@ -0,0 +1,32 @@ +From 1f27900352e04ff4f19bec1c1e9635adad2be31c Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Fri, 18 May 2018 10:40:00 +0100 +Subject: [PATCH] Fix unescaped left braces in regexps, deprecated since Perl + 5.27.8 + +This fixes test failures on recent Perl versions. +--- + tp/Texinfo/Parser.pm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm +index dc32ca2..c577aa9 100644 +--- a/tp/Texinfo/Parser.pm ++++ b/tp/Texinfo/Parser.pm +@@ -5478,11 +5478,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.17.0 + diff --git a/sys-apps/texinfo/texinfo-6.5.recipe b/sys-apps/texinfo/texinfo-6.5.recipe index 2516fdd61..7686d7bd3 100644 --- a/sys-apps/texinfo/texinfo-6.5.recipe +++ b/sys-apps/texinfo/texinfo-6.5.recipe @@ -4,10 +4,11 @@ Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" COPYRIGHT="1992-2008 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz" CHECKSUM_SHA256="d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec8b1427" -PATCHES="texinfo-$portVersion.patchset" +PATCHES="texinfo-$portVersion.patchset + 0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch" ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"