|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
--- intltool-0.51.0/intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+++ intltool-0.51.0/intltool-update.in 2017-11-12 13:48:23.236000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
@@ -1062,13 +1062,13 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
{
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
my $rest = $3;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
my $untouched = $1;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
my $sub = "";
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
# Ignore recursive definitions of variables
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2\}?/;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
return SubstituteVariable ("$untouched$sub$rest");
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
@@ -1190,10 +1190,10 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
$name =~ s/\(+$//g;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
$version =~ s/\(+$//g;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
@@ -1219,11 +1219,11 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
$version =~ s/\(+$//g;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
$bugurl =~ s/\(+$//g if (defined $bugurl);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5f82a0 |
# \s makes this not work, why?
|