From e1c55103a675132f81169375aebb663a01bd9c6c Mon Sep 17 00:00:00 2001
From: Joseph Cloutier <jkcloutier@gmail.com>
Date: Sat, 21 May 2022 20:28:16 -0400
Subject: [PATCH] Update FreeType to 2.12.1.

Note: cff.c includes all the other cffxyz.c files. They're still there.
---
 project/lib/freetype                                |  2 +-
 project/lib/freetype-files.xml                      | 13 ++++++-------
 .../freetype/include/freetype/config/ftoption.h     |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/project/lib/freetype b/project/lib/freetype
index 86bc8a950..e8ebfe988 160000
--- a/project/lib/freetype
+++ b/project/lib/freetype
@@ -1 +1 @@
-Subproject commit 86bc8a95056c97a810986434a3f268cbe67f2902
+Subproject commit e8ebfe988b5f57bfb9a3ecb13c70d9791bce9ecf
diff --git a/project/lib/freetype-files.xml b/project/lib/freetype-files.xml
index 079ff70c6..c9c322cfd 100644
--- a/project/lib/freetype-files.xml
+++ b/project/lib/freetype-files.xml
@@ -108,13 +108,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bdf/bdf.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bzip2/ftbzip2.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cache/ftcache.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffcmap.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffdrivr.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffgload.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffload.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffobjs.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffparse.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffpic.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cff.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cid/type1cid.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/gzip/ftgzip.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/lzw/ftlzw.c" />
@@ -124,8 +118,13 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/pshinter/pshinter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/psnames/psmodule.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/raster/raster.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftbsdf.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdf.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfcommon.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfrend.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sfnt/sfnt.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/smooth/smooth.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/svg/ftsvg.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/truetype/truetype.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type1/type1.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type42/type42.c" />
diff --git a/project/lib/overrides/freetype/include/freetype/config/ftoption.h b/project/lib/overrides/freetype/include/freetype/config/ftoption.h
index 107a3a7e6..01cf90979 100644
--- a/project/lib/overrides/freetype/include/freetype/config/ftoption.h
+++ b/project/lib/overrides/freetype/include/freetype/config/ftoption.h
@@ -218,7 +218,7 @@ FT_BEGIN_HEADER
   /*   options set by those programs have precendence, overwriting the     */
   /*   value here with the configured one.                                 */
   /*                                                                       */
-/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
+#define FT_CONFIG_OPTION_SYSTEM_ZLIB
 
 
   /*************************************************************************/