diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-06 03:35:33 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-06 03:35:33 -0500 |
| commit | aa7977f03becc5d5941c97d1ad2ef8dd33a14c7f (patch) | |
| tree | df53eb1d16f4df80411f10168c1f0932e43f129a /user/intltool/intltool-perl-regexp.patch | |
| parent | 5fac6cbe425b27e36ebed83ea572208e7b054c4e (diff) | |
| download | packages-aa7977f03becc5d5941c97d1ad2ef8dd33a14c7f.tar.gz packages-aa7977f03becc5d5941c97d1ad2ef8dd33a14c7f.tar.bz2 packages-aa7977f03becc5d5941c97d1ad2ef8dd33a14c7f.tar.xz packages-aa7977f03becc5d5941c97d1ad2ef8dd33a14c7f.zip | |
user/intltool: pull in, fix
Diffstat (limited to 'user/intltool/intltool-perl-regexp.patch')
| -rw-r--r-- | user/intltool/intltool-perl-regexp.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/user/intltool/intltool-perl-regexp.patch b/user/intltool/intltool-perl-regexp.patch new file mode 100644 index 000000000..f423bee92 --- /dev/null +++ b/user/intltool/intltool-perl-regexp.patch @@ -0,0 +1,50 @@ +--- a/intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000 ++++ b/intltool-update.in 2017-01-22 20:14:20.359080387 +0000 +@@ -1062,13 +1062,13 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? |