[bug#27360] [core-updates] gnu: intltool: Fix a compatibility issue with Perl 5.26.0.

[Leo Famulari]

* gnu/packages/patches/intltool-perl-compatibility.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/glib.scm (intltool)[source]: Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/glib.scm                              |  1 +
 .../patches/intltool-perl-compatibility.patch      | 51 ++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 gnu/packages/patches/intltool-perl-compatibility.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e30fa34ef..93dda46d0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -677,6 +677,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
+  %D%/packages/patches/intltool-perl-compatibility.patch.patch \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/jbig2dec-CVE-2016-9601.patch            \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fcd1daf5e..926703e15 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -347,6 +347,7 @@ bindings to call into the C library.")
              (uri (string-append "https://launchpad.net/intltool/trunk/";
                                  version "/+download/intltool-"
                                  version ".tar.gz"))
+             (patches (search-patches "intltool-perl-compatibility.patch"))
              (sha256
               (base32
                "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"))))
diff --git a/gnu/packages/patches/intltool-perl-compatibility.patch 
b/gnu/packages/patches/intltool-perl-compatibility.patch
new file mode 100644
index 000000000..5fc5d507d
--- /dev/null
+++ b/gnu/packages/patches/intltool-perl-compatibility.patch
@@ -0,0 +1,51 @@
+This patch fixes a compatibility issue with Perl 5.26.0:
+
+https://bugs.launchpad.net/intltool/+bug/1696658
+
+Copied from 3rd-party repository:
+
+https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch
+
+--- intltool-0.51.0.orig/intltool-update.in    2015-03-09 02:39:54.000000000 
+0100
++++ intltool-0.51.0.orig/intltool-update.in    2015-06-19 01:52:07.171228154 
+0200
+@@ -1062,7 +1062,7 @@ 
+       }
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+       my $rest = $3;
+       my $untouched = $1;
+@@ -1190,10 +1190,10 @@ 
+       $name    =~ s/\(+$//g;
+       $version =~ s/\(+$//g;
+ 
+-      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\${?AC_PACKAGE_NAME}?/);
+-      $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\${?AC_PACKAGE_VERSION}?/);
+-      $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\$\{?AC_PACKAGE_NAME}?/);
++      $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\$\{?AC_PACKAGE_VERSION}?/);
++      $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@ 
+       $version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\${?AC_PACKAGE_NAME}?/);
+-      $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\${?AC_PACKAGE_VERSION}?/);
+-      $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not 
$bugurl =~ /\${?\w+}?/);
++      $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\$\{?AC_PACKAGE_NAME}?/);
++      $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++      $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\$\{?AC_PACKAGE_VERSION}?/);
++      $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not 
$bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
-- 
2.13.1