|
 |
f38d92c |
Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
|
|
|
f38d92c |
Author: Roderich Schupp <roderich.schupp@gmail.com>
|
|
|
f38d92c |
Author: gregor herrmann <gregoa@debian.org>
|
|
|
f38d92c |
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
|
|
|
f38d92c |
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
|
|
|
f38d92c |
Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
|
|
|
f38d92c |
|
|
|
f38d92c |
Index: intltool-0.51.0/intltool-update.in
|
|
|
f38d92c |
===================================================================
|
|
|
f38d92c |
--- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200
|
|
|
f38d92c |
+++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200
|
|
|
f38d92c |
@@ -1062,13 +1062,13 @@
|
|
 |
151857f |
}
|
|
|
151857f |
}
|
|
|
151857f |
|
|
|
151857f |
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
|
151857f |
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|
|
151857f |
{
|
|
|
151857f |
my $rest = $3;
|
|
|
151857f |
my $untouched = $1;
|
|
|
f38d92c |
my $sub = "";
|
|
|
f38d92c |
# Ignore recursive definitions of variables
|
|
|
f38d92c |
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
|
|
|
f38d92c |
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
|
|
|
f38d92c |
|
|
|
f38d92c |
return SubstituteVariable ("$untouched$sub$rest");
|
|
|
f38d92c |
}
|
|
|
151857f |
@@ -1190,10 +1190,10 @@
|
|
|
151857f |
$name =~ s/\(+$//g;
|
|
|
151857f |
$version =~ s/\(+$//g;
|
|
|
151857f |
|
|
|
151857f |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
|
151857f |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
|
151857f |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
|
151857f |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
|
151857f |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
|
151857f |
}
|
|
|
151857f |
|
|
|
151857f |
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|
|
151857f |
@@ -1219,11 +1219,11 @@
|
|
|
151857f |
$version =~ s/\(+$//g;
|
|
|
151857f |
$bugurl =~ s/\(+$//g if (defined $bugurl);
|
|
|
151857f |
|
|
|
151857f |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
|
151857f |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
|
151857f |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
|
151857f |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
|
151857f |
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
|
151857f |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
|
151857f |
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
|
|
|
151857f |
}
|
|
|
151857f |
|
|
|
151857f |
# \s makes this not work, why?
|