| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Tue, 26 Jul 2016 16:57:10 -0700 | |
| changeset 6508 | 042760730035 |
| permissions | -rw-r--r-- |
|
6508
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
Fix warnings from perl-5.22 about deprecated regex syntax. |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
Patch from upstream bug report: |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
https://bugs.launchpad.net/intltool/+bug/1490906 |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
=== modified file 'intltool-update.in' |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
--- a/intltool-update.in 2014-05-14 02:15:53 +0000 |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ b/intltool-update.in 2016-01-19 19:06:54 +0000 |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -1062,7 +1062,7 @@ |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
} |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
} |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
{
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
my $rest = $3; |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
my $untouched = $1; |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -1190,10 +1190,10 @@ |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
$name =~ s/\(+$//g; |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
$version =~ s/\(+$//g; |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
28 |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
29 |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
30 |
} |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
31 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
32 |
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
33 |
@@ -1219,11 +1219,11 @@ |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
34 |
$version =~ s/\(+$//g; |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
35 |
$bugurl =~ s/\(+$//g if (defined $bugurl); |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
36 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
37 |
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
38 |
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
39 |
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
40 |
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
41 |
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
42 |
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
43 |
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
44 |
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
45 |
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
46 |
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
47 |
} |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
48 |
|
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
49 |
# \s makes this not work, why? |
|
042760730035
24356929 intltool warnings about deprecated regex syntax from perl 5.22
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
50 |