From 95377733b7087af893d7d61476937048233d5d5f Mon Sep 17 00:00:00 2001
From: Akira Kakuto
Date: Tue, 20 Oct 2020 22:06:32 +0000
Subject: freetype 2.10.4
git-svn-id: svn://tug.org/texlive/trunk@56720 c570f23f-e606-0410-a88d-b1316a301751
---
Build/source/libs/README | 2 +-
Build/source/libs/freetype2/ChangeLog | 5 +
Build/source/libs/freetype2/TLpatches/ChangeLog | 5 +
Build/source/libs/freetype2/TLpatches/TL-Changes | 2 +-
Build/source/libs/freetype2/configure | 20 ++--
.../libs/freetype2/freetype-src/CMakeLists.txt | 2 +-
Build/source/libs/freetype2/freetype-src/ChangeLog | 39 ++++++++
Build/source/libs/freetype2/freetype-src/README | 8 +-
.../freetype-src/builds/unix/config.guess | 14 ++-
.../freetype2/freetype-src/builds/unix/configure | 20 ++--
.../freetype-src/builds/unix/configure.ac | 4 +-
.../freetype-src/builds/unix/configure.raw | 2 +-
.../freetype-src/builds/wince/vc2005-ce/index.html | 2 +-
.../freetype-src/builds/wince/vc2008-ce/index.html | 2 +-
.../freetype-src/builds/windows/vc2010/index.html | 2 +-
.../freetype-src/builds/windows/visualc/index.html | 2 +-
.../builds/windows/visualce/index.html | 2 +-
.../libs/freetype2/freetype-src/docs/CHANGES | 15 +++
.../libs/freetype2/freetype-src/docs/VERSIONS.TXT | 1 +
.../freetype2/freetype-src/docs/freetype-config.1 | 2 +-
.../freetype2/freetype-src/docs/reference/404.html | 12 +--
.../docs/reference/ft2-auto_hinter.html | 12 +--
.../docs/reference/ft2-base_interface.html | 12 +--
.../docs/reference/ft2-basic_types.html | 12 +--
.../freetype-src/docs/reference/ft2-bdf_fonts.html | 12 +--
.../docs/reference/ft2-bitmap_handling.html | 12 +--
.../freetype-src/docs/reference/ft2-bzip2.html | 12 +--
.../docs/reference/ft2-cache_subsystem.html | 12 +--
.../docs/reference/ft2-cff_driver.html | 12 +--
.../freetype-src/docs/reference/ft2-cid_fonts.html | 12 +--
.../docs/reference/ft2-color_management.html | 12 +--
.../docs/reference/ft2-computations.html | 12 +--
.../docs/reference/ft2-error_code_values.html | 12 +--
.../docs/reference/ft2-error_enumerations.html | 12 +--
.../docs/reference/ft2-font_formats.html | 12 +--
.../docs/reference/ft2-gasp_table.html | 12 +--
.../docs/reference/ft2-glyph_management.html | 12 +--
.../docs/reference/ft2-glyph_stroker.html | 12 +--
.../docs/reference/ft2-glyph_variants.html | 12 +--
.../docs/reference/ft2-gx_validation.html | 12 +--
.../freetype-src/docs/reference/ft2-gzip.html | 12 +--
.../docs/reference/ft2-header_file_macros.html | 12 +--
.../docs/reference/ft2-header_inclusion.html | 12 +--
.../docs/reference/ft2-incremental.html | 12 +--
.../freetype-src/docs/reference/ft2-index.html | 18 ++--
.../docs/reference/ft2-layer_management.html | 12 +--
.../docs/reference/ft2-lcd_rendering.html | 12 +--
.../docs/reference/ft2-list_processing.html | 12 +--
.../freetype-src/docs/reference/ft2-lzw.html | 12 +--
.../docs/reference/ft2-mac_specific.html | 12 +--
.../docs/reference/ft2-module_management.html | 12 +--
.../docs/reference/ft2-multiple_masters.html | 12 +--
.../docs/reference/ft2-ot_validation.html | 12 +--
.../docs/reference/ft2-outline_processing.html | 12 +--
.../docs/reference/ft2-parameter_tags.html | 12 +--
.../docs/reference/ft2-pcf_driver.html | 12 +--
.../freetype-src/docs/reference/ft2-pfr_fonts.html | 12 +--
.../docs/reference/ft2-properties.html | 12 +--
.../docs/reference/ft2-quick_advance.html | 12 +--
.../freetype-src/docs/reference/ft2-raster.html | 14 +--
.../docs/reference/ft2-sfnt_names.html | 12 +--
.../docs/reference/ft2-sizes_management.html | 12 +--
.../docs/reference/ft2-system_interface.html | 12 +--
.../docs/reference/ft2-t1_cid_driver.html | 12 +--
.../docs/reference/ft2-truetype_engine.html | 12 +--
.../docs/reference/ft2-truetype_tables.html | 12 +--
.../freetype-src/docs/reference/ft2-tt_driver.html | 12 +--
.../docs/reference/ft2-type1_tables.html | 12 +--
.../docs/reference/ft2-user_allocation.html | 12 +--
.../freetype-src/docs/reference/ft2-version.html | 14 +--
.../docs/reference/ft2-winfnt_fonts.html | 12 +--
.../freetype-src/docs/reference/index.html | 18 ++--
.../docs/reference/search/search_index.json | 2 +-
.../freetype-src/docs/reference/sitemap.xml | 102 ++++++++++-----------
.../freetype-src/docs/reference/sitemap.xml.gz | Bin 217 -> 219 bytes
.../freetype-src/include/freetype/freetype.h | 2 +-
.../freetype-src/include/freetype/ftimage.h | 2 +-
.../libs/freetype2/freetype-src/src/base/ftver.rc | 4 +-
.../libs/freetype2/freetype-src/src/sfnt/pngshim.c | 14 +--
.../libs/freetype2/freetype-src/src/sfnt/sfwoff2.c | 8 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcolr.c | 6 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcpal.c | 12 +--
Build/source/libs/freetype2/version.ac | 2 +-
83 files changed, 504 insertions(+), 441 deletions(-)
(limited to 'Build/source/libs')
diff --git a/Build/source/libs/README b/Build/source/libs/README
index f63062fd77a..772b78a1331 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -12,7 +12,7 @@ See also comments in ../texk/README.
cairo 1.16.0 - checked 20oct18
http://cairographics.org/releases/
-freetype2 2.10.3 - checked 11oct20
+freetype2 2.10.4 - checked 21oct20
http://savannah.nongnu.org/download/freetype/
gd 2.3.0 - checked 10apr20
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 72d14704035..a2cd310e8bd 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-21 Akira Kakuto
+
+ Import freetype-2.10.4.
+ * version.ac: Adjusted.
+
2020-10-11 Akira Kakuto
Import freetype-2.10.3.
diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog
index 26be0fb3f94..261a00ab925 100644
--- a/Build/source/libs/freetype2/TLpatches/ChangeLog
+++ b/Build/source/libs/freetype2/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-21 Akira Kakuto
+
+ Imported freetype-2.10.4 source tree from:
+ http://savannah.nongnu.org/download/freetype/
+
2020-10-11 Akira Kakuto
Imported freetype-2.10.3 source tree from:
diff --git a/Build/source/libs/freetype2/TLpatches/TL-Changes b/Build/source/libs/freetype2/TLpatches/TL-Changes
index 148ee0bcf5f..41b70e4c8ab 100644
--- a/Build/source/libs/freetype2/TLpatches/TL-Changes
+++ b/Build/source/libs/freetype2/TLpatches/TL-Changes
@@ -1,2 +1,2 @@
-Changes applied to the freetype-2.10.3/ tree as obtained from:
+Changes applied to the freetype-2.10.4/ tree as obtained from:
http://savannah.nongnu.org/download/freetype/.
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index 6699c1f8194..98a043e49ab 100755
--- a/Build/source/libs/freetype2/configure
+++ b/Build/source/libs/freetype2/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.10.3.
+# Generated by GNU Autoconf 2.69 for FreeType (TeX Live) 2.10.4.
#
# Report bugs to .
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType (TeX Live)'
PACKAGE_TARNAME='freetype--tex-live-'
-PACKAGE_VERSION='2.10.3'
-PACKAGE_STRING='FreeType (TeX Live) 2.10.3'
+PACKAGE_VERSION='2.10.4'
+PACKAGE_STRING='FreeType (TeX Live) 2.10.4'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1235,7 +1235,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType (TeX Live) 2.10.3 to adapt to many kinds of systems.
+\`configure' configures FreeType (TeX Live) 2.10.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1302,7 +1302,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType (TeX Live) 2.10.3:";;
+ short | recursive ) echo "Configuration of FreeType (TeX Live) 2.10.4:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType (TeX Live) configure 2.10.3
+FreeType (TeX Live) configure 2.10.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1499,7 +1499,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType (TeX Live) $as_me 2.10.3, which was
+It was created by FreeType (TeX Live) $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3423,7 +3423,7 @@ fi
# Define the identity of the package.
PACKAGE='freetype--tex-live-'
- VERSION='2.10.3'
+ VERSION='2.10.4'
cat >>confdefs.h <<_ACEOF
@@ -4956,7 +4956,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType (TeX Live) $as_me 2.10.3, which was
+This file was extended by FreeType (TeX Live) $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5013,7 +5013,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeType (TeX Live) config.status 2.10.3
+FreeType (TeX Live) config.status 2.10.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/freetype2/freetype-src/CMakeLists.txt b/Build/source/libs/freetype2/freetype-src/CMakeLists.txt
index 5d13417beb6..3ed55aad7d8 100644
--- a/Build/source/libs/freetype2/freetype-src/CMakeLists.txt
+++ b/Build/source/libs/freetype2/freetype-src/CMakeLists.txt
@@ -147,7 +147,7 @@ project(freetype C)
set(VERSION_MAJOR "2")
set(VERSION_MINOR "10")
-set(VERSION_PATCH "3")
+set(VERSION_PATCH "4")
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
diff --git a/Build/source/libs/freetype2/freetype-src/ChangeLog b/Build/source/libs/freetype2/freetype-src/ChangeLog
index 969e3f5ae1c..42f7c34ba8c 100644
--- a/Build/source/libs/freetype2/freetype-src/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-src/ChangeLog
@@ -1,3 +1,42 @@
+2020-10-20 Werner Lemberg
+
+ * Version 2.10.4 released.
+ ==========================
+
+
+ Tag sources with `VER-2-10-4'.
+
+ * docs/VERSION.TXT: Add entry for version 2.10.4.
+ * docs/CHANGES: Updated.
+
+ * README, src/base/ftver.rc, builds/windows/vc2010/index.html,
+ builds/windows/visualc/index.html,
+ builds/windows/visualce/index.html,
+ builds/wince/vc2005-ce/index.html,
+ builds/wince/vc2008-ce/index.html, docs/freetype-config.1:
+ s/2.10.3/2.10.4/, s/2103/2104/.
+
+ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4.
+
+ * builds/unix/configure.raw (version_info): Set to 23:4:17.
+ * CMakeLists.txt (VERSION_PATCH): Set to 4.
+
+2020-10-19 Werner Lemberg
+
+ [sfnt] Fix heap buffer overflow (#59308).
+
+ This is CVE-2020-15999.
+
+ * src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier.
+
+2020-10-17 Alexei Podtelezhnikov
+
+ * src/sfnt/tt{colr,cpal}.c: Fix signedness warnings from VC++.
+
+2020-10-17 Alexei Podtelezhnikov
+
+ * src/sfnt/sfwoff2.c (Read255UShort): Tweak types to please VC++.
+
2020-10-10 Werner Lemberg
* Version 2.10.3 released.
diff --git a/Build/source/libs/freetype2/freetype-src/README b/Build/source/libs/freetype2/freetype-src/README
index 2e2e9e2f8a7..e4c8cf1c575 100644
--- a/Build/source/libs/freetype2/freetype-src/README
+++ b/Build/source/libs/freetype2/freetype-src/README
@@ -1,4 +1,4 @@
- FreeType 2.10.3
+ FreeType 2.10.4
===============
Homepage: https://www.freetype.org
@@ -27,9 +27,9 @@
and download one of the following files.
- freetype-doc-2.10.3.tar.xz
- freetype-doc-2.10.3.tar.gz
- ftdoc2103.zip
+ freetype-doc-2.10.4.tar.xz
+ freetype-doc-2.10.4.tar.gz
+ ftdoc2104.zip
To view the documentation online, go to
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
index 9aff91cfd03..8d70ec2b263 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2020 Free Software Foundation, Inc.
-timestamp='2020-08-17'
+timestamp='2020-09-19'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -150,17 +150,15 @@ Linux|GNU|GNU/*)
#elif defined(__dietlibc__)
LIBC=dietlibc
#else
+ #include
+ #ifdef __DEFINED_va_list
+ LIBC=musl
+ #else
LIBC=gnu
#endif
+ #endif
EOF
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
- # If ldd exists, use it to detect musl libc.
- if command -v ldd >/dev/null && \
- ldd --version 2>&1 | grep -q ^musl
- then
- LIBC=musl
- fi
;;
esac
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
index b4c4d44ca0c..d62efe8fafc 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.10.3.
+# Generated by GNU Autoconf 2.69 for FreeType 2.10.4.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.10.3'
-PACKAGE_STRING='FreeType 2.10.3'
+PACKAGE_VERSION='2.10.4'
+PACKAGE_STRING='FreeType 2.10.4'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -1340,7 +1340,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType 2.10.3 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.10.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.10.3:";;
+ short | recursive ) echo "Configuration of FreeType 2.10.4:";;
esac
cat <<\_ACEOF
@@ -1560,7 +1560,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.10.3
+FreeType configure 2.10.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2158,7 +2158,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.10.3, which was
+It was created by FreeType $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2514,7 +2514,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='23:3:17'
+version_info='23:4:17'
ft_version=`echo $version_info | tr : .`
@@ -15645,7 +15645,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType $as_me 2.10.3, which was
+This file was extended by FreeType $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15711,7 +15711,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeType config.status 2.10.3
+FreeType config.status 2.10.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
index d9c6ad8b74c..f54b94631d2 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.10.3], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.10.4], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='23:3:17'
+version_info='23:4:17'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
index 7ac44fb85a1..bc65e452af7 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='23:3:17'
+version_info='23:4:17'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html
index 9fdf09153f0..6936a890959 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
PPC/SP WM6 (Windows Mobile 6)
-It compiles the following libraries from the FreeType 2.10.3 sources:
+It compiles the following libraries from the FreeType 2.10.4 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html
index b90214fa762..ee385af86ac 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
PPC/SP WM6 (Windows Mobile 6)
-It compiles the following libraries from the FreeType 2.10.3 sources:
+It compiles the following libraries from the FreeType 2.10.4 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
index 91ffa208409..3b60c5fe1bc 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
@@ -12,7 +12,7 @@
This directory contains solution and project files for
Visual C++ 2010 or newer, named freetype.sln,
and freetype.vcxproj. It compiles the following libraries
-from the FreeType 2.10.3 sources:
+from the FreeType 2.10.4 sources:
- freetype.dll using 'Release' or 'Debug' configurations
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
index e8986d071de..cec26d27abf 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
@@ -12,7 +12,7 @@
This directory contains project files freetype.dsp for
Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002
through 2008, which you might need to upgrade automatically.
-It compiles the following libraries from the FreeType 2.10.3 sources:
+It compiles the following libraries from the FreeType 2.10.4 sources:
- freetype.dll using 'Release' or 'Debug' configurations
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
index 733dff691db..474e85c378e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
@@ -21,7 +21,7 @@ the following targets:
- PPC/SP WM6 (Windows Mobile 6)
-It compiles the following libraries from the FreeType 2.10.3 sources:
+It compiles the following libraries from the FreeType 2.10.4 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/docs/CHANGES b/Build/source/libs/freetype2/freetype-src/docs/CHANGES
index a2f6d87fdeb..3bd5291ae1e 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/CHANGES
+++ b/Build/source/libs/freetype2/freetype-src/docs/CHANGES
@@ -1,3 +1,18 @@
+CHANGES BETWEEN 2.10.3 and 2.10.4
+
+ I. IMPORTANT BUG FIXES
+
+ - A heap buffer overflow has been found in the handling of embedded
+ PNG bitmaps, introduced in FreeType version 2.6.
+
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15999
+
+ If you use option FT_CONFIG_OPTION_USE_PNG you should upgrade
+ immediately.
+
+
+======================================================================
+
CHANGES BETWEEN 2.10.2 and 2.10.3
I. IMPORTANT CHANGES
diff --git a/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT b/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
index 60fac15241c..4e281a72527 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
+++ b/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
@@ -60,6 +60,7 @@ found on _most_ systems, but not all of them:
release libtool so
-------------------------------
+ 2.10.4 23.4.17 6.17.4
2.10.3 23.3.17 6.17.3
2.10.2 23.2.17 6.17.2
2.10.1 23.1.17 6.17.1
diff --git a/Build/source/libs/freetype2/freetype-src/docs/freetype-config.1 b/Build/source/libs/freetype2/freetype-src/docs/freetype-config.1
index 1b048e46d00..7dea66afa0d 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/freetype-config.1
+++ b/Build/source/libs/freetype2/freetype-src/docs/freetype-config.1
@@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "October 2020" "FreeType 2.10.3"
+.TH FREETYPE-CONFIG 1 "October 2020" "FreeType 2.10.4"
.
.
.SH NAME
diff --git a/Build/source/libs/freetype2/freetype-src/docs/reference/404.html b/Build/source/libs/freetype2/freetype-src/docs/reference/404.html
index 1911c312ac4..1fb642171db 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/reference/404.html
+++ b/Build/source/libs/freetype2/freetype-src/docs/reference/404.html
@@ -10,7 +10,7 @@
-
+
@@ -40,7 +40,7 @@
- FreeType-2.10.3 API Reference
+ FreeType-2.10.4 API Reference
@@ -94,7 +94,7 @@