1Perl 5.22 has deprecated some regex features, which causes warnings when
2intltool-update runs:
3
4Unescaped 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
8Take a patch from Debian to solve this.
9
10Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010)
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13Index: intltool-0.51.0/intltool-update.in
14===================================================================
15--- intltool-0.51.0.orig/intltool-update.in
16+++ intltool-0.51.0/intltool-update.in
17@@ -1062,7 +1062,7 @@ sub SubstituteVariable
18 	}
19     }
20
21-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
22+    if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
23     {
24 	my $rest = $3;
25 	my $untouched = $1;
26@@ -1190,10 +1190,10 @@ sub FindPackageName
27 	$name    =~ s/\(+$//g;
28 	$version =~ s/\(+$//g;
29
30-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
31-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
32-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
33-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
34+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
35+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
36+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
37+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
38     }
39
40     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
41@@ -1219,11 +1219,11 @@ sub FindPackageName
42 	$version =~ s/\(+$//g;
43         $bugurl  =~ s/\(+$//g if (defined $bugurl);
44
45-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
46-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
47-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
48-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
49-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
50+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
51+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
52+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
53+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
54+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);
55     }
56
57     # \s makes this not work, why?
58