6506N/AFix warnings from perl-5.22 about deprecated regex syntax.

6506N/A

6506N/APatch from upstream bug report:

6506N/A

6506N/A=== modified file 'intltool-update.in'

6506N/A--- a/intltool-update.in 2014-05-14 02:15:53 +0000

6506N/A+++ b/intltool-update.in 2016-01-19 19:06:54 +0000

6506N/A@@ -1062,7 +1062,7 @@

6506N/A }

6506N/A }

6506N/A

6506N/A- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)

6506N/A+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)

6506N/A {

6506N/A my $rest = $3;

6506N/A my $untouched = $1;

6506N/A@@ -1190,10 +1190,10 @@

6506N/A $name =~ s/\(+$//g;

6506N/A $version =~ s/\(+$//g;

6506N/A

6506N/A- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

6506N/A- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

6506N/A- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

6506N/A- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

6506N/A+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);

6506N/A+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);

6506N/A+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);

6506N/A+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);

6506N/A }

6506N/A

6506N/A if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)

6506N/A@@ -1219,11 +1219,11 @@

6506N/A $version =~ s/\(+$//g;

6506N/A $bugurl =~ s/\(+$//g if (defined $bugurl);

6506N/A

6506N/A- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

6506N/A- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

6506N/A- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

6506N/A- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

6506N/A- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);

6506N/A+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);

6506N/A+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);

6506N/A+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);

6506N/A+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);

6506N/A+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);

6506N/A }

6506N/A

6506N/A # \s makes this not work, why?

6506N/A