| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | https://bugs.launchpad.net/intltool/+bug/1490906 |
| 2 | |
| 3 | fix warnings w/newer perl: |
| 4 | 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. |
| 5 | |
| 6 | --- a/intltool-update.in |
| 7 | +++ b/intltool-update.in |
| 8 | @@ -1062,7 +1062,7 @@ |
| 9 | } |
| 10 | } |
| 11 | |
| 12 | - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) |
| 13 | + if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) |
| 14 | { |
| 15 | my $rest = $3; |
| 16 | my $untouched = $1; |
| 17 | @@ -1190,10 +1190,10 @@ |
| 18 | $name =~ s/\(+$//g; |
| 19 | $version =~ s/\(+$//g; |
| 20 | |
| 21 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 22 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 23 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 24 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 25 | + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); |
| 26 | + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); |
| 27 | + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); |
| 28 | + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); |
| 29 | } |
| 30 | |
| 31 | if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) |
| 32 | @@ -1219,11 +1219,11 @@ |
| 33 | $version =~ s/\(+$//g; |
| 34 | $bugurl =~ s/\(+$//g if (defined $bugurl); |
| 35 | |
| 36 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 37 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 38 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 39 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 40 | - $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); |
| 41 | + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); |
| 42 | + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); |
| 43 | + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); |
| 44 | + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); |
| 45 | + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); |
| 46 | } |
| 47 | |
| 48 | # \s makes this not work, why? |