5f82a0
patches/intltool-0.51.0.local.patch: escape curly braces within regular expressions in intltool-update.
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
--- intltool-0.51.0/intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000
|
|
2
|
+
+++ intltool-0.51.0/intltool-update.in 2017-11-12 13:48:23.236000000 +0000
|
|
3
|
+
|
|
4
|
+
}
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
8
|
+
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
|
|
9
|
+
{
|
|
10
|
+
my $rest = $3;
|
|
11
|
+
my $untouched = $1;
|
|
12
|
+
my $sub = "";
|
|
13
|
+
# Ignore recursive definitions of variables
|
|
14
|
+
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
|
|
15
|
+
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2\}?/;
|
|
16
|
+
|
|
17
|
+
return SubstituteVariable ("$untouched$sub$rest");
|
|
18
|
+
}
|
|
19
|
+
|
|
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
|
+
|
|
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?
|