01/04: gnu: address@hidden: Fix FTBFS with Perl >= 5.28.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit a446cf26d7f386a81b8667f5ec75fb5f6232d202
Author: Marius Bakke <address@hidden>
Date:   Fri Aug 31 17:05:24 2018 +0200

    gnu: address@hidden: Fix FTBFS with Perl >= 5.28.
    
    * gnu/packages/patches/texinfo-5-perl-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/texinfo.scm (texinfo-5)[source](patches): New field.
---
 gnu/local.mk                                     |  1 +
 gnu/packages/patches/texinfo-5-perl-compat.patch | 19 +++++++++++++++++++
 gnu/packages/texinfo.scm                         |  1 +
 3 files changed, 21 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 76d6f69..3309186 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1158,6 +1158,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/teensy-loader-cli-help.patch            \
   %D%/packages/patches/teeworlds-use-latest-wavpack.patch      \
   %D%/packages/patches/texinfo-perl-compat.patch               \
+  %D%/packages/patches/texinfo-5-perl-compat.patch             \
   %D%/packages/patches/texi2html-document-encoding.patch       \
   %D%/packages/patches/texi2html-i18n.patch                    \
   %D%/packages/patches/thefuck-test-environ.patch              \
diff --git a/gnu/packages/patches/texinfo-5-perl-compat.patch 
b/gnu/packages/patches/texinfo-5-perl-compat.patch
new file mode 100644
index 0000000..f16d6b4
--- /dev/null
+++ b/gnu/packages/patches/texinfo-5-perl-compat.patch
@@ -0,0 +1,19 @@
+Fix a deprecation warning with newer Perl that breaks some tests.
+
+--- a/tp/Texinfo/Parser.pm
++++ b/tp/Texinfo/Parser.pm
+@@ -5438,12 +5438,12 @@
+     }
+   } elsif ($command eq 'clickstyle') {
+     # REMACRO
+-    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) {
+       $args = ['@'.$1];
+       $self->{'clickstyle'} = $1
+         unless(_ignore_global_commands($self));
+       $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->__(
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 5fe7f1e..fa98bd5 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -69,6 +69,7 @@ is on expressing the content semantically, avoiding physical 
markup commands.")
               (method url-fetch)
               (uri (string-append "mirror://gnu/texinfo/texinfo-"
                                   version ".tar.xz"))
+              (patches (search-patches "texinfo-5-perl-compat.patch"))
               (sha256
                (base32
                 "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"))))