1*4882a593SmuzhiyunFix regex errors thrown by Perl 5.26: 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunUnescaped 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*4882a593Smuzhiyun 5*4882a593SmuzhiyunFetched from: 6*4882a593Smuzhiyunhttps://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunReported upstream: 9*4882a593Smuzhiyunhttps://bugs.launchpad.net/intltool/+bug/1696658 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Jörg Krause <joerg.krause@embedded.rocks> 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 14*4882a593Smuzhiyun+++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 15*4882a593Smuzhiyun@@ -1062,7 +1062,7 @@ 16*4882a593Smuzhiyun } 17*4882a593Smuzhiyun } 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) 20*4882a593Smuzhiyun+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) 21*4882a593Smuzhiyun { 22*4882a593Smuzhiyun my $rest = $3; 23*4882a593Smuzhiyun my $untouched = $1; 24*4882a593Smuzhiyun@@ -1190,10 +1190,10 @@ 25*4882a593Smuzhiyun $name =~ s/\(+$//g; 26*4882a593Smuzhiyun $version =~ s/\(+$//g; 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); 29*4882a593Smuzhiyun- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); 30*4882a593Smuzhiyun- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); 31*4882a593Smuzhiyun- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); 32*4882a593Smuzhiyun+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); 33*4882a593Smuzhiyun+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); 34*4882a593Smuzhiyun+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); 35*4882a593Smuzhiyun+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) 39*4882a593Smuzhiyun@@ -1219,11 +1219,11 @@ 40*4882a593Smuzhiyun $version =~ s/\(+$//g; 41*4882a593Smuzhiyun $bugurl =~ s/\(+$//g if (defined $bugurl); 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); 44*4882a593Smuzhiyun- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); 45*4882a593Smuzhiyun- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); 46*4882a593Smuzhiyun- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); 47*4882a593Smuzhiyun- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); 48*4882a593Smuzhiyun+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); 49*4882a593Smuzhiyun+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); 50*4882a593Smuzhiyun+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); 51*4882a593Smuzhiyun+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); 52*4882a593Smuzhiyun+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); 53*4882a593Smuzhiyun } 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun # \s makes this not work, why? 56