1Fix regex errors thrown by Perl 5.26: 2 3Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at $BUILDROOT/host/usr/bin/intltool-update line 1065. 4 5Fetched from: 6https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch 7 8Reported upstream: 9https://bugs.launchpad.net/intltool/+bug/1696658 10 11Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> 12 13--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 14+++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +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? 56