intltool-update fails with Perl 5.26

Running intltool-update with Perl 5.26 fails:

"""
Unescaped left brace in regex is illegal here in regex; marked by <--
HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at
/home/joerg/Development/buildroot/host/usr/bin/intltool-update line
1065.
"""

Change-Id: I0f7bebb03bd1b11680744387111cba89ff7c5a2a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
(cherry picked from commit a33a53096a19fd452482f14dc17ac1996e4c0a61)

diff --git a/intltool-update.in b/intltool-update.in
index df591c6..049f449 100644 (file)
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -1061,7 +1061,7 @@ sub SubstituteVariable
        }
     }
 
-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
     {
        my $rest = $3;
        my $untouched = $1;
@@ -1189,10 +1189,10 @@ sub FindPackageName
        $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)
@@ -1218,11 +1218,11 @@ sub FindPackageName
        $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?