commit 70b68161af9b7958fef6de39a3331762b2f4a5cf Author: Marcin Krol <h...@tld-linux.org> Date: Fri Aug 31 21:49:34 2018 +0000
- regex fix from Debian regex-fix.patch | 32 ++++++++++++++++++++++++++++++++ texinfo.spec | 2 ++ 2 files changed, 34 insertions(+) --- diff --git a/texinfo.spec b/texinfo.spec index 2fac62b..e7cfbe1 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -17,6 +17,7 @@ Source0: http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.xz # Source0-md5: 3715197e62e0e07f85860b3d7aab55ed Source1: info.desktop Patch0: %{name}-info.patch +Patch1: regex-fix.patch URL: http://www.gnu.org/software/texinfo/ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.14 @@ -187,6 +188,7 @@ Narzędzie do konwersji plików texinfo na dvi. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__aclocal} -I gnulib/m4 diff --git a/regex-fix.patch b/regex-fix.patch new file mode 100644 index 0000000..ac56456 --- /dev/null +++ b/regex-fix.patch @@ -0,0 +1,32 @@ +From 1f27900352e04ff4f19bec1c1e9635adad2be31c Mon Sep 17 00:00:00 2001 +From: Niko Tyni <nt...@debian.org> +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 + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/texinfo.git/commitdiff/70b68161af9b7958fef6de39a3331762b2f4a5cf _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit