diff options
Diffstat (limited to 'main/intltool/intltool-perl-regexp.patch')
| -rw-r--r-- | main/intltool/intltool-perl-regexp.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/intltool/intltool-perl-regexp.patch b/main/intltool/intltool-perl-regexp.patch index 34ee03aa7d..f423bee92f 100644 --- a/main/intltool/intltool-perl-regexp.patch +++ b/main/intltool/intltool-perl-regexp.patch @@ -1,6 +1,6 @@ --- 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,7 +1062,7 @@ +@@ -1062,13 +1062,13 @@ } } @@ -9,6 +9,13 @@ { 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; @@ -41,4 +48,3 @@ } # \s makes this not work, why? - |