firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll FreeType to a version based on 2.11.1 (flutter/engine#31678)

Browse Source
This commit is contained in:
Jason Simmons
2022-02-28 14:26:12 -08:00
committed by GitHub
parent 807287ff34
commit aad9e6c5f8
3 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -372,7 +372,7 @@ deps = {
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + 'a28238bdeebc087071777001245df1876a11f5ee',
'src/third_party/freetype2':
Var('flutter_git') + '/third_party/freetype2' + '@' + '1f03c1b2d7f2ae832a4fbe9d12bd96c3c15bbece',
Var('flutter_git') + '/third_party/freetype2' + '@' + '3234e16d2322c936f777d1ef046e689e78b6c52e',
'src/third_party/root_certificates':
Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@@ -1,2 +1,2 @@
Signature: fb1ee9723a82b06b7333d6cbb23dfe9b
Signature: 270842a9eb9687ced20abdf5f131bafd

70
engine/src/flutter/tools/licenses/lib/main.dart
View File

@@ -484,41 +484,45 @@ class _RepositoryFreetypeLicenseFile extends _RepositoryLicenseFile {
: _target = _parseLicense(io), super(parent, io);
static final RegExp _pattern = RegExp(
r'The FreeType 2 font engine is copyrighted work and cannot be used\n'
r'legally without a software license\. In order to make this project\n'
r'usable to a vast majority of developers, we distribute it under two\n'
r'FREETYPE LICENSES\n'
r'-----------------\n'
r'\n'
r'The FreeType 2 font engine is copyrighted work and cannot be used\n'
r'legally without a software license\. In order to make this project\n'
r'usable to a vast majority of developers, we distribute it under two\n'
r'mutually exclusive open-source licenses\.\n'
r'\n'
r'This means that \*you\* must choose \*one\* of the two licenses described\n'
r'below, then obey all its terms and conditions when using FreeType 2 in\n'
r'any of your projects or products.\n'
r'This means that \*you\* must choose \*one\* of the two licenses described\n'
r'below, then obey all its terms and conditions when using FreeType 2 in\n'
r'any of your projects or products\.\n'
r'\n'
r" - The FreeType License, found in the file `(FTL\.TXT)', which is similar\n"
r' to the original BSD license \*with\* an advertising clause that forces\n'
r" you to explicitly cite the FreeType project in your product's\n"
r' documentation\. All details are in the license file\. This license\n'
r" is suited to products which don't use the GNU General Public\n"
r' License\.\n'
r' - The FreeType License, found in the file `docs/(FTL\.TXT)`, which is\n'
r' similar to the original BSD license \*with\* an advertising clause\n'
r' that forces you to explicitly cite the FreeType project in your\n'
r" product's documentation\. All details are in the license file\.\n"
r" This license is suited to products which don't use the GNU General\n"
r' Public License\.\n'
r'\n'
r' Note that this license is compatible to the GNU General Public\n'
r' Note that this license is compatible to the GNU General Public\n'
r' License version 3, but not version 2\.\n'
r'\n'
r" - The GNU General Public License version 2, found in `GPLv2\.TXT' \(any\n"
r' later version can be used also\), for programs which already use the\n'
r' GPL\. Note that the FTL is incompatible with GPLv2 due to its\n'
r' advertisement clause\.\n'
r' - The GNU General Public License version 2, found in\n'
r' `docs/GPLv2\.TXT` \(any later version can be used also\), for\n'
r' programs which already use the GPL\. Note that the FTL is\n'
r' incompatible with GPLv2 due to its advertisement clause\.\n'
r'\n'
r'The contributed BDF and PCF drivers come with a license similar to that\n'
r'of the X Window System\. It is compatible to the above two licenses \(see\n'
r'file src/bdf/README and src/pcf/README\)\. The same holds for the files\n'
r"`fthash\.c' and `fthash\.h'; their code was part of the BDF driver in\n"
r'earlier FreeType versions\.\n'
r'The contributed BDF and PCF drivers come with a license similar to\n'
r'that of the X Window System\. It is compatible to the above two\n'
r'licenses \(see files `src/bdf/README` and `src/pcf/README`\)\. The same\n'
r'holds for the source code files `src/base/fthash\.c` and\n'
r'`include/freetype/internal/fthash\.h`; they wer part of the BDF driver\n'
r'in earlier FreeType versions\.\n'
r'\n'
r'The gzip module uses the zlib license \(see src/gzip/zlib\.h\) which too is\n'
r'compatible to the above two licenses\.\n'
r'The gzip module uses the zlib license \(see `src/gzip/zlib\.h`\) which\n'
r'too is compatible to the above two licenses\.\n'
r'\n'
r'The MD5 checksum support \(only used for debugging in development builds\)\n'
r'is in the public domain\.\n'
r'The MD5 checksum support \(only used for debugging in development\n'
r'builds\) is in the public domain\.\n'
r'\n*'
r'--- end of LICENSE\.TXT ---\n*$'
);
@@ -1385,13 +1389,6 @@ class _RepositoryExpatExpatDirectory extends _RepositoryDirectory {
class _RepositoryFreetypeDocsDirectory extends _RepositoryDirectory {
_RepositoryFreetypeDocsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
@override
_RepositoryFile createFile(fs.IoNode entry) {
if (entry.name == 'LICENSE.TXT')
return _RepositoryFreetypeLicenseFile(this, entry as fs.TextFile);
return super.createFile(entry);
}
@override
int get fileCount => 0;
@@ -1478,6 +1475,13 @@ class _RepositoryFreetypeDirectory extends _RepositoryDirectory {
&& super.shouldRecurse(entry);
}
@override
_RepositoryFile createFile(fs.IoNode entry) {
if (entry.name == 'LICENSE.TXT')
return _RepositoryFreetypeLicenseFile(this, entry as fs.TextFile);
return super.createFile(entry);
}
@override
_RepositoryDirectory createSubdirectory(fs.Directory entry) {
if (entry.name == 'src')