diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-03-23 14:17:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-12 10:51:34 +0200 |
| commit | 2233c6aab2d51b0cb765cdc3fc0f61931a0c8476 (patch) | |
| tree | 6cb1e5455ff967017fcf0ea303fe043b1b8ba93e /solenv | |
| parent | 20ee7250fb637efec0e9f4845098b1a1de1f7953 (diff) | |
tdf#116581: also read UTF16-encoded version string from TTF
Change-Id: I47d8a755450b085be39346615f06cee4f920859f
Reviewed-on: https://gerrit.libreoffice.org/51781
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2367557493c216be5b5e8156ba6493d440a10b0f)
Reviewed-on: https://gerrit.libreoffice.org/52327
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f207ae9c7010b04f8a10554a3c9b62991fe51247)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/file.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index 1a12becb6076..b8176a54794c 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -560,12 +560,20 @@ sub get_fileversion close TTF; my $ttfversion = "(Version )([0-9]+[.]*([0-9][.])*[0-9]+)"; + # UTF16-encoded version string + my $ttfversionU = "(V\0e\0r\0s\0i\0o\0n\0 \0)(([0-9]\0)+([.]\0([0-9]\0)+)*)"; if ($ttfdata =~ /$ttfversion/ms) { my ($version, $subversion, $microversion, $vervariant) = split(/\./,$2); $fileversion = int($version) . "." . int($subversion) . "." . int($microversion) . "." . int($vervariant); } + elsif ($ttfdata =~ /$ttfversionU/ms) + { + my $verfound = $2 + my ($version, $subversion, $microversion, $vervariant) = split(/\./,$verfound =~ s/\0//g); + $fileversion = int($version) . "." . int($subversion) . "." . int($microversion) . "." . int($vervariant); + } else { $fileversion = "1.0.0.0"; |