| https://bugs.launchpad.net/intltool/+bug/1490906 |
| |
| fix warnings w/newer perl: |
| Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. |
| |
| --- a/intltool-update.in |
| +++ b/intltool-update.in |
| @@ -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? |