| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Perl 5.22 has deprecated some regex features, which causes warnings when |
| 2 | intltool-update runs: |
| 3 | |
| 4 | Unescaped left brace in regex is deprecated, passed through in regex; marked by |
| 5 | <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at |
| 6 | /data/poky-master/tmp/sysroots/x86_64-linux/usr/bin/intltool-update line 1065. |
| 7 | |
| 8 | Take a patch from Debian to solve this. |
| 9 | |
| 10 | Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) |
| 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 12 | |
| 13 | --- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 |
| 14 | +++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 |
| 15 | @@ -1062,7 +1062,7 @@ |
| 16 | } |
| 17 | } |
| 18 | |
| 19 | - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) |
| 20 | + if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/) |
| 21 | { |
| 22 | my $rest = $3; |
| 23 | my $untouched = $1; |
| 24 | @@ -1190,10 +1190,10 @@ |
| 25 | $name =~ s/\(+$//g; |
| 26 | $version =~ s/\(+$//g; |
| 27 | |
| 28 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 29 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 30 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 31 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 32 | + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/); |
| 33 | + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/); |
| 34 | + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/); |
| 35 | + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/); |
| 36 | } |
| 37 | |
| 38 | if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) |
| 39 | @@ -1219,11 +1219,11 @@ |
| 40 | $version =~ s/\(+$//g; |
| 41 | $bugurl =~ s/\(+$//g if (defined $bugurl); |
| 42 | |
| 43 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); |
| 44 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); |
| 45 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); |
| 46 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); |
| 47 | - $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); |
| 48 | + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/); |
| 49 | + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/); |
| 50 | + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/); |
| 51 | + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/); |
| 52 | + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); |
| 53 | } |
| 54 | |
| 55 | # \s makes this not work, why? |