46 lines
2.1 KiB
Text
46 lines
2.1 KiB
Text
|
https://bugs.launchpad.net/intltool/+bug/1490906
|
||
|
|
|
||
|
|
--- intltool-update.in.orig Mon Mar 9 02:39:54 2015
|
||
|
|
+++ intltool-update.in Sat Feb 27 09:44:38 2016
|
||
|
|
@@ -1062,7 +1062,7 @@ sub SubstituteVariable
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
||
|
|
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
||
|
|
{
|
||
|
|
my $rest = $3;
|
||
|
|
my $untouched = $1;
|
||
|
|
@@ -1190,10 +1190,10 @@ sub FindPackageName
|
||
|
|
$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 @@ sub FindPackageName
|
||
|
|
$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?
|