| [be893b3] | 1 | Submitted by: Chris Staub (chris at clfs dot org)
|
|---|
| 2 | Date: 2017-06-10
|
|---|
| 3 | Initial Package Version: 0.51
|
|---|
| 4 | Origin: https://raw.githubusercontent.com/Alexpux/MSYS2-packages/master/intltool/perl-5.22-compatibility.patch
|
|---|
| 5 | Description: Updates Intltool to work with Perl 5.26
|
|---|
| 6 |
|
|---|
| [6dc0453] | 7 | diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
|
|---|
| 8 | --- intltool-0.51.0.orig/intltool-update.in 2015-03-09 01:39:54.000000000 +0000
|
|---|
| 9 | +++ intltool-0.51.0/intltool-update.in 2017-06-10 07:16:39.637921936 +0000
|
|---|
| 10 | @@ -1062,7 +1062,7 @@
|
|---|
| 11 | }
|
|---|
| 12 | }
|
|---|
| 13 |
|
|---|
| 14 | - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|---|
| 15 | + if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|---|
| 16 | {
|
|---|
| 17 | my $rest = $3;
|
|---|
| 18 | my $untouched = $1;
|
|---|
| 19 | @@ -1190,10 +1190,10 @@
|
|---|
| 20 | $name =~ s/\(+$//g;
|
|---|
| 21 | $version =~ s/\(+$//g;
|
|---|
| 22 |
|
|---|
| 23 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|---|
| 24 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|---|
| 25 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|---|
| 26 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|---|
| 27 | + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|---|
| 28 | + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|---|
| 29 | + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|---|
| 30 | + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|---|
| 31 | }
|
|---|
| 32 |
|
|---|
| 33 | if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|---|
| 34 | @@ -1219,11 +1219,11 @@
|
|---|
| 35 | $version =~ s/\(+$//g;
|
|---|
| 36 | $bugurl =~ s/\(+$//g if (defined $bugurl);
|
|---|
| 37 |
|
|---|
| 38 | - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|---|
| 39 | - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|---|
| 40 | - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|---|
| 41 | - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|---|
| 42 | - $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|---|
| 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 | }
|
|---|
| 49 |
|
|---|
| 50 | # \s makes this not work, why?
|
|---|
