From 37e731f0bd81249f8b43bada12adaa611b7a595b Mon Sep 17 00:00:00 2001
From: Akira Kakuto
Date: Tue, 5 Apr 2022 21:27:03 +0000
Subject: freetype2 : revert
git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751
---
Build/source/libs/freetype2/ChangeLog | 5 -
Build/source/libs/freetype2/TLpatches/ChangeLog | 4 -
Build/source/libs/freetype2/TLpatches/TL-Changes | 2 +-
Build/source/libs/freetype2/configure | 20 +-
.../libs/freetype2/freetype-src/CMakeLists.txt | 28 +-
Build/source/libs/freetype2/freetype-src/ChangeLog | 1366 --------------
Build/source/libs/freetype2/freetype-src/Makefile | 2 +-
Build/source/libs/freetype2/freetype-src/README | 10 +-
.../source/libs/freetype2/freetype-src/README.git | 2 +-
.../source/libs/freetype2/freetype-src/autogen.sh | 2 +-
.../freetype2/freetype-src/builds/amiga/README | 2 +-
.../builds/amiga/include/config/ftconfig.h | 2 +-
.../builds/amiga/include/config/ftmodule.h | 2 +-
.../freetype2/freetype-src/builds/amiga/makefile | 2 +-
.../freetype-src/builds/amiga/makefile.os4 | 2 +-
.../freetype2/freetype-src/builds/amiga/smakefile | 2 +-
.../freetype-src/builds/amiga/src/base/ftdebug.c | 2 +-
.../freetype-src/builds/amiga/src/base/ftsystem.c | 2 +-
.../freetype2/freetype-src/builds/ansi/ansi-def.mk | 2 +-
.../freetype2/freetype-src/builds/ansi/ansi.mk | 2 +-
.../freetype2/freetype-src/builds/beos/beos-def.mk | 2 +-
.../freetype2/freetype-src/builds/beos/beos.mk | 2 +-
.../freetype2/freetype-src/builds/beos/detect.mk | 2 +-
.../freetype-src/builds/cmake/FindBrotliDec.cmake | 2 +-
.../freetype2/freetype-src/builds/cmake/iOS.cmake | 2 +-
.../freetype-src/builds/cmake/testbuild.sh | 2 +-
.../freetype-src/builds/compiler/ansi-cc.mk | 2 +-
.../freetype-src/builds/compiler/bcc-dev.mk | 2 +-
.../freetype2/freetype-src/builds/compiler/bcc.mk | 2 +-
.../freetype2/freetype-src/builds/compiler/emx.mk | 2 +-
.../freetype-src/builds/compiler/gcc-dev.mk | 2 +-
.../freetype2/freetype-src/builds/compiler/gcc.mk | 2 +-
.../freetype-src/builds/compiler/intelc.mk | 2 +-
.../freetype-src/builds/compiler/unix-lcc.mk | 2 +-
.../freetype-src/builds/compiler/visualage.mk | 2 +-
.../freetype-src/builds/compiler/visualc.mk | 2 +-
.../freetype-src/builds/compiler/watcom.mk | 2 +-
.../freetype-src/builds/compiler/win-lcc.mk | 2 +-
.../libs/freetype2/freetype-src/builds/detect.mk | 2 +-
.../freetype2/freetype-src/builds/dos/detect.mk | 2 +-
.../freetype2/freetype-src/builds/dos/dos-def.mk | 2 +-
.../freetype2/freetype-src/builds/dos/dos-emx.mk | 2 +-
.../freetype2/freetype-src/builds/dos/dos-gcc.mk | 2 +-
.../freetype2/freetype-src/builds/dos/dos-wat.mk | 2 +-
.../libs/freetype2/freetype-src/builds/exports.mk | 2 +-
.../libs/freetype2/freetype-src/builds/freetype.mk | 2 +-
.../libs/freetype2/freetype-src/builds/link_dos.mk | 2 +-
.../libs/freetype2/freetype-src/builds/link_std.mk | 2 +-
.../freetype-src/builds/mac/freetype-Info.plist | 2 +-
.../libs/freetype2/freetype-src/builds/mac/ftmac.c | 4 +-
.../builds/meson/extract_freetype_version.py | 4 +-
.../builds/meson/extract_libtool_version.py | 4 +-
.../builds/meson/generate_reference_docs.py | 4 +-
.../freetype-src/builds/meson/parse_modules_cfg.py | 5 +-
.../builds/meson/process_ftoption_h.py | 4 +-
.../libs/freetype2/freetype-src/builds/modules.mk | 2 +-
.../freetype2/freetype-src/builds/os2/detect.mk | 2 +-
.../freetype2/freetype-src/builds/os2/os2-def.mk | 2 +-
.../freetype2/freetype-src/builds/os2/os2-dev.mk | 2 +-
.../freetype2/freetype-src/builds/os2/os2-gcc.mk | 2 +-
.../freetype2/freetype-src/builds/symbian/bld.inf | 2 +-
.../freetype-src/builds/symbian/freetype.mmp | 2 +-
.../libs/freetype2/freetype-src/builds/toplevel.mk | 9 +-
.../freetype2/freetype-src/builds/unix/config.sub | 6 +-
.../freetype2/freetype-src/builds/unix/configure | 206 +--
.../freetype-src/builds/unix/configure.ac | 109 +-
.../freetype-src/builds/unix/configure.raw | 107 +-
.../freetype2/freetype-src/builds/unix/detect.mk | 2 +-
.../freetype-src/builds/unix/freetype-config.in | 2 +-
.../freetype-src/builds/unix/freetype2.in | 8 +-
.../freetype-src/builds/unix/freetype2.m4 | 2 +-
.../freetype-src/builds/unix/ft-munmap.m4 | 2 +-
.../freetype-src/builds/unix/ftconfig.h.in | 2 +-
.../freetype2/freetype-src/builds/unix/ftsystem.c | 2 +-
.../freetype2/freetype-src/builds/unix/install.mk | 2 +-
.../freetype2/freetype-src/builds/unix/unix-cc.in | 12 +-
.../freetype2/freetype-src/builds/unix/unix-def.in | 36 +-
.../freetype2/freetype-src/builds/unix/unix-dev.mk | 2 +-
.../freetype2/freetype-src/builds/unix/unix-lcc.mk | 2 +-
.../freetype2/freetype-src/builds/unix/unix.mk | 2 +-
.../freetype2/freetype-src/builds/unix/unixddef.mk | 2 +-
.../freetype2/freetype-src/builds/vms/ftconfig.h | 2 +-
.../freetype2/freetype-src/builds/vms/ftsystem.c | 2 +-
.../freetype2/freetype-src/builds/wince/ftdebug.c | 2 +-
.../freetype-src/builds/wince/vc2005-ce/index.html | 2 +-
.../freetype-src/builds/wince/vc2008-ce/index.html | 2 +-
.../freetype-src/builds/windows/detect.mk | 2 +-
.../freetype-src/builds/windows/ftdebug.c | 8 +-
.../freetype-src/builds/windows/ftsystem.c | 92 +-
.../builds/windows/vc2010/freetype.vcxproj | 1 -
.../builds/windows/vc2010/freetype.vcxproj.filters | 5 +-
.../freetype-src/builds/windows/vc2010/index.html | 2 +-
.../builds/windows/visualc/freetype.vcproj | 8 -
.../freetype-src/builds/windows/visualc/index.html | 2 +-
.../builds/windows/visualce/index.html | 2 +-
.../freetype-src/builds/windows/w32-bcc.mk | 2 +-
.../freetype-src/builds/windows/w32-bccd.mk | 2 +-
.../freetype-src/builds/windows/w32-dev.mk | 2 +-
.../freetype-src/builds/windows/w32-gcc.mk | 2 +-
.../freetype-src/builds/windows/w32-icc.mk | 2 +-
.../freetype-src/builds/windows/w32-intl.mk | 2 +-
.../freetype-src/builds/windows/w32-lcc.mk | 2 +-
.../freetype-src/builds/windows/w32-mingw32.mk | 2 +-
.../freetype-src/builds/windows/w32-vcc.mk | 2 +-
.../freetype-src/builds/windows/w32-wat.mk | 2 +-
.../freetype-src/builds/windows/win32-def.mk | 2 +-
Build/source/libs/freetype2/freetype-src/configure | 2 +-
.../libs/freetype2/freetype-src/devel/ft2build.h | 2 +-
.../libs/freetype2/freetype-src/devel/ftoption.h | 22 +-
.../libs/freetype2/freetype-src/docs/CHANGES | 53 +-
.../libs/freetype2/freetype-src/docs/CUSTOMIZE | 2 +-
.../source/libs/freetype2/freetype-src/docs/DEBUG | 2 +-
.../libs/freetype2/freetype-src/docs/DOCGUIDE | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL.ANY | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL.CROSS | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL.GNU | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL.UNIX | 2 +-
.../libs/freetype2/freetype-src/docs/INSTALL.VMS | 2 +-
Build/source/libs/freetype2/freetype-src/docs/TODO | 2 +-
.../libs/freetype2/freetype-src/docs/VERSIONS.TXT | 3 +-
.../libs/freetype2/freetype-src/docs/formats.txt | 2 +-
.../freetype2/freetype-src/docs/freetype-config.1 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.20 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.21 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.210 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.22 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.23 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.24 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.25 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.26 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.27 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.28 | 2 +-
.../freetype-src/docs/oldlogs/ChangeLog.29 | 2 +-
.../libs/freetype2/freetype-src/docs/raster.txt | 2 +-
.../freetype2/freetype-src/docs/reference/404.html | 38 +-
.../docs/reference/ft2-auto_hinter.html | 38 +-
.../docs/reference/ft2-base_interface.html | 250 +--
.../docs/reference/ft2-basic_types.html | 44 +-
.../freetype-src/docs/reference/ft2-bdf_fonts.html | 38 +-
.../docs/reference/ft2-bitmap_handling.html | 38 +-
.../freetype-src/docs/reference/ft2-bzip2.html | 38 +-
.../docs/reference/ft2-cache_subsystem.html | 38 +-
.../docs/reference/ft2-cff_driver.html | 38 +-
.../freetype-src/docs/reference/ft2-cid_fonts.html | 38 +-
.../docs/reference/ft2-color_management.html | 38 +-
.../docs/reference/ft2-computations.html | 38 +-
.../docs/reference/ft2-debugging_apis.html | 38 +-
.../docs/reference/ft2-error_code_values.html | 42 +-
.../docs/reference/ft2-error_enumerations.html | 38 +-
.../docs/reference/ft2-font_formats.html | 42 +-
.../docs/reference/ft2-gasp_table.html | 38 +-
.../docs/reference/ft2-glyph_management.html | 152 +-
.../docs/reference/ft2-glyph_stroker.html | 38 +-
.../docs/reference/ft2-glyph_variants.html | 38 +-
.../docs/reference/ft2-gx_validation.html | 38 +-
.../freetype-src/docs/reference/ft2-gzip.html | 38 +-
.../docs/reference/ft2-header_file_macros.html | 59 +-
.../docs/reference/ft2-header_inclusion.html | 38 +-
.../docs/reference/ft2-incremental.html | 38 +-
.../freetype-src/docs/reference/ft2-index.html | 79 +-
.../docs/reference/ft2-layer_management.html | 38 +-
.../docs/reference/ft2-lcd_rendering.html | 38 +-
.../docs/reference/ft2-list_processing.html | 38 +-
.../freetype-src/docs/reference/ft2-lzw.html | 38 +-
.../docs/reference/ft2-mac_specific.html | 38 +-
.../docs/reference/ft2-module_management.html | 38 +-
.../docs/reference/ft2-multiple_masters.html | 39 +-
.../docs/reference/ft2-ot_svg_driver.html | 1256 -------------
.../docs/reference/ft2-ot_validation.html | 38 +-
.../docs/reference/ft2-outline_processing.html | 42 +-
.../docs/reference/ft2-parameter_tags.html | 60 +-
.../docs/reference/ft2-pcf_driver.html | 42 +-
.../freetype-src/docs/reference/ft2-pfr_fonts.html | 38 +-
.../freetype-src/docs/reference/ft2-preamble.html | 38 +-
.../docs/reference/ft2-properties.html | 79 +-
.../docs/reference/ft2-quick_advance.html | 38 +-
.../freetype-src/docs/reference/ft2-raster.html | 38 +-
.../docs/reference/ft2-sfnt_names.html | 38 +-
.../docs/reference/ft2-sizes_management.html | 38 +-
.../freetype-src/docs/reference/ft2-svg_fonts.html | 1582 ----------------
.../docs/reference/ft2-system_interface.html | 38 +-
.../docs/reference/ft2-t1_cid_driver.html | 38 +-
.../docs/reference/ft2-truetype_engine.html | 38 +-
.../docs/reference/ft2-truetype_tables.html | 38 +-
.../freetype-src/docs/reference/ft2-tt_driver.html | 45 +-
.../docs/reference/ft2-type1_tables.html | 60 +-
.../docs/reference/ft2-user_allocation.html | 38 +-
.../freetype-src/docs/reference/ft2-version.html | 42 +-
.../docs/reference/ft2-winfnt_fonts.html | 42 +-
.../freetype-src/docs/reference/index.html | 50 +-
.../docs/reference/search/search_index.json | 2 +-
.../freetype-src/docs/reference/sitemap.xml | 116 +-
.../freetype-src/docs/reference/sitemap.xml.gz | Bin 229 -> 226 bytes
.../libs/freetype2/freetype-src/docs/release | 19 +-
.../include/freetype/config/ftconfig.h | 2 +-
.../include/freetype/config/ftheader.h | 14 +-
.../include/freetype/config/ftmodule.h | 1 -
.../include/freetype/config/ftoption.h | 22 +-
.../include/freetype/config/ftstdlib.h | 2 +-
.../include/freetype/config/integer-types.h | 7 +-
.../include/freetype/config/mac-support.h | 2 +-
.../include/freetype/config/public-macros.h | 2 +-
.../freetype-src/include/freetype/freetype.h | 280 +--
.../freetype-src/include/freetype/ftadvanc.h | 2 +-
.../freetype-src/include/freetype/ftbbox.h | 2 +-
.../freetype-src/include/freetype/ftbdf.h | 2 +-
.../freetype-src/include/freetype/ftbitmap.h | 2 +-
.../freetype-src/include/freetype/ftbzip2.h | 2 +-
.../freetype-src/include/freetype/ftcache.h | 2 +-
.../freetype-src/include/freetype/ftchapters.h | 2 -
.../freetype-src/include/freetype/ftcid.h | 2 +-
.../freetype-src/include/freetype/ftcolor.h | 2 +-
.../freetype-src/include/freetype/ftdriver.h | 75 +-
.../freetype-src/include/freetype/fterrdef.h | 6 +-
.../freetype-src/include/freetype/fterrors.h | 2 +-
.../freetype-src/include/freetype/ftfntfmt.h | 2 +-
.../freetype-src/include/freetype/ftgasp.h | 2 +-
.../freetype-src/include/freetype/ftglyph.h | 102 +-
.../freetype-src/include/freetype/ftgxval.h | 2 +-
.../freetype-src/include/freetype/ftgzip.h | 2 +-
.../freetype-src/include/freetype/ftimage.h | 19 +-
.../freetype-src/include/freetype/ftincrem.h | 2 +-
.../freetype-src/include/freetype/ftlcdfil.h | 2 +-
.../freetype-src/include/freetype/ftlist.h | 2 +-
.../freetype-src/include/freetype/ftlogging.h | 2 +-
.../freetype-src/include/freetype/ftlzw.h | 2 +-
.../freetype-src/include/freetype/ftmac.h | 2 +-
.../freetype2/freetype-src/include/freetype/ftmm.h | 5 +-
.../freetype-src/include/freetype/ftmodapi.h | 2 +-
.../freetype-src/include/freetype/ftmoderr.h | 2 +-
.../freetype-src/include/freetype/ftotval.h | 2 +-
.../freetype-src/include/freetype/ftoutln.h | 14 +-
.../freetype-src/include/freetype/ftparams.h | 17 +-
.../freetype-src/include/freetype/ftpfr.h | 2 +-
.../freetype-src/include/freetype/ftrender.h | 2 +-
.../freetype-src/include/freetype/ftsizes.h | 2 +-
.../freetype-src/include/freetype/ftsnames.h | 2 +-
.../freetype-src/include/freetype/ftstroke.h | 2 +-
.../freetype-src/include/freetype/ftsynth.h | 2 +-
.../freetype-src/include/freetype/ftsystem.h | 2 +-
.../freetype-src/include/freetype/fttrigon.h | 2 +-
.../freetype-src/include/freetype/fttypes.h | 2 +-
.../freetype-src/include/freetype/ftwinfnt.h | 2 +-
.../include/freetype/internal/autohint.h | 2 +-
.../include/freetype/internal/cffotypes.h | 2 +-
.../include/freetype/internal/cfftypes.h | 2 +-
.../include/freetype/internal/compiler-macros.h | 8 +-
.../include/freetype/internal/ftcalc.h | 15 +-
.../include/freetype/internal/ftdebug.h | 2 +-
.../freetype-src/include/freetype/internal/ftdrv.h | 2 +-
.../include/freetype/internal/ftgloadr.h | 2 +-
.../include/freetype/internal/ftmemory.h | 2 +-
.../include/freetype/internal/ftobjs.h | 5 +-
.../include/freetype/internal/ftpsprop.h | 2 +-
.../include/freetype/internal/ftrfork.h | 2 +-
.../include/freetype/internal/ftserv.h | 2 +-
.../include/freetype/internal/ftstream.h | 2 +-
.../include/freetype/internal/fttrace.h | 6 +-
.../include/freetype/internal/ftvalid.h | 2 +-
.../freetype-src/include/freetype/internal/psaux.h | 2 +-
.../include/freetype/internal/pshints.h | 2 +-
.../include/freetype/internal/services/svbdf.h | 2 +-
.../include/freetype/internal/services/svcfftl.h | 2 +-
.../include/freetype/internal/services/svcid.h | 2 +-
.../include/freetype/internal/services/svfntfmt.h | 2 +-
.../include/freetype/internal/services/svgldict.h | 2 +-
.../include/freetype/internal/services/svgxval.h | 2 +-
.../include/freetype/internal/services/svkern.h | 2 +-
.../include/freetype/internal/services/svmetric.h | 2 +-
.../include/freetype/internal/services/svmm.h | 2 +-
.../include/freetype/internal/services/svotval.h | 2 +-
.../include/freetype/internal/services/svpfr.h | 2 +-
.../include/freetype/internal/services/svpostnm.h | 2 +-
.../include/freetype/internal/services/svprop.h | 2 +-
.../include/freetype/internal/services/svpscmap.h | 2 +-
.../include/freetype/internal/services/svpsinfo.h | 2 +-
.../include/freetype/internal/services/svsfnt.h | 2 +-
.../include/freetype/internal/services/svttcmap.h | 2 +-
.../include/freetype/internal/services/svtteng.h | 2 +-
.../include/freetype/internal/services/svttglyf.h | 2 +-
.../include/freetype/internal/services/svwinfnt.h | 2 +-
.../freetype-src/include/freetype/internal/sfnt.h | 44 +-
.../include/freetype/internal/svginterface.h | 46 -
.../include/freetype/internal/t1types.h | 2 +-
.../include/freetype/internal/tttypes.h | 14 +-
.../include/freetype/internal/wofftypes.h | 2 +-
.../freetype-src/include/freetype/otsvg.h | 336 ----
.../freetype-src/include/freetype/t1tables.h | 168 +-
.../freetype-src/include/freetype/ttnameid.h | 2 +-
.../freetype-src/include/freetype/tttables.h | 2 +-
.../freetype-src/include/freetype/tttags.h | 3 +-
.../libs/freetype2/freetype-src/include/ft2build.h | 2 +-
.../source/libs/freetype2/freetype-src/meson.build | 72 +-
.../libs/freetype2/freetype-src/meson_options.txt | 8 +-
.../source/libs/freetype2/freetype-src/modules.cfg | 5 +-
.../freetype2/freetype-src/src/autofit/afblue.c | 2 +-
.../freetype2/freetype-src/src/autofit/afblue.cin | 2 +-
.../freetype2/freetype-src/src/autofit/afblue.dat | 2 +-
.../freetype2/freetype-src/src/autofit/afblue.h | 2 +-
.../freetype2/freetype-src/src/autofit/afblue.hin | 2 +-
.../freetype2/freetype-src/src/autofit/afcjk.c | 14 +-
.../freetype2/freetype-src/src/autofit/afcjk.h | 2 +-
.../freetype2/freetype-src/src/autofit/afcover.h | 2 +-
.../freetype2/freetype-src/src/autofit/afdummy.c | 2 +-
.../freetype2/freetype-src/src/autofit/afdummy.h | 2 +-
.../freetype2/freetype-src/src/autofit/aferrors.h | 2 +-
.../freetype2/freetype-src/src/autofit/afglobal.c | 10 +-
.../freetype2/freetype-src/src/autofit/afglobal.h | 2 +-
.../freetype2/freetype-src/src/autofit/afhints.c | 6 +-
.../freetype2/freetype-src/src/autofit/afhints.h | 2 +-
.../freetype2/freetype-src/src/autofit/afindic.c | 2 +-
.../freetype2/freetype-src/src/autofit/afindic.h | 2 +-
.../freetype2/freetype-src/src/autofit/aflatin.c | 12 +-
.../freetype2/freetype-src/src/autofit/aflatin.h | 2 +-
.../freetype2/freetype-src/src/autofit/afloader.c | 2 +-
.../freetype2/freetype-src/src/autofit/afloader.h | 2 +-
.../freetype2/freetype-src/src/autofit/afmodule.c | 2 +-
.../freetype2/freetype-src/src/autofit/afmodule.h | 2 +-
.../freetype2/freetype-src/src/autofit/afranges.c | 2 +-
.../freetype2/freetype-src/src/autofit/afranges.h | 2 +-
.../freetype2/freetype-src/src/autofit/afscript.h | 2 +-
.../freetype2/freetype-src/src/autofit/afshaper.c | 2 +-
.../freetype2/freetype-src/src/autofit/afshaper.h | 2 +-
.../freetype2/freetype-src/src/autofit/afstyles.h | 2 +-
.../freetype2/freetype-src/src/autofit/aftypes.h | 2 +-
.../freetype2/freetype-src/src/autofit/afws-decl.h | 2 +-
.../freetype2/freetype-src/src/autofit/afws-iter.h | 2 +-
.../freetype2/freetype-src/src/autofit/autofit.c | 2 +-
.../freetype2/freetype-src/src/autofit/module.mk | 2 +-
.../freetype2/freetype-src/src/autofit/rules.mk | 2 +-
.../freetype2/freetype-src/src/base/ftadvanc.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftbase.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftbase.h | 3 +-
.../libs/freetype2/freetype-src/src/base/ftbbox.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftbdf.c | 2 +-
.../freetype2/freetype-src/src/base/ftbitmap.c | 10 +-
.../libs/freetype2/freetype-src/src/base/ftcalc.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftcid.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftcolor.c | 2 +-
.../freetype2/freetype-src/src/base/ftdbgmem.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftdebug.c | 2 +-
.../freetype2/freetype-src/src/base/fterrors.c | 2 +-
.../freetype2/freetype-src/src/base/ftfntfmt.c | 2 +-
.../freetype2/freetype-src/src/base/ftfstype.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftgasp.c | 2 +-
.../freetype2/freetype-src/src/base/ftgloadr.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftglyph.c | 253 +--
.../libs/freetype2/freetype-src/src/base/ftgxval.c | 2 +-
.../libs/freetype2/freetype-src/src/base/fthash.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftinit.c | 2 +-
.../freetype2/freetype-src/src/base/ftlcdfil.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftmac.c | 4 +-
.../libs/freetype2/freetype-src/src/base/ftmm.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftobjs.c | 118 +-
.../libs/freetype2/freetype-src/src/base/ftotval.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftoutln.c | 2 +-
.../freetype2/freetype-src/src/base/ftpatent.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftpfr.c | 2 +-
.../freetype2/freetype-src/src/base/ftpsprop.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftrfork.c | 6 +-
.../freetype2/freetype-src/src/base/ftsnames.c | 2 +-
.../freetype2/freetype-src/src/base/ftstream.c | 2 +-
.../freetype2/freetype-src/src/base/ftstroke.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftsynth.c | 2 +-
.../freetype2/freetype-src/src/base/ftsystem.c | 2 +-
.../freetype2/freetype-src/src/base/fttrigon.c | 2 +-
.../libs/freetype2/freetype-src/src/base/fttype1.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftutil.c | 2 +-
.../libs/freetype2/freetype-src/src/base/ftver.rc | 8 +-
.../freetype2/freetype-src/src/base/ftwinfnt.c | 2 +-
.../libs/freetype2/freetype-src/src/base/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/bdf/README | 6 +-
.../libs/freetype2/freetype-src/src/bdf/bdflib.c | 8 +-
.../freetype2/freetype-src/src/bzip2/ftbzip2.c | 42 +-
.../libs/freetype2/freetype-src/src/bzip2/rules.mk | 2 +-
.../freetype2/freetype-src/src/cache/ftcache.c | 2 +-
.../freetype2/freetype-src/src/cache/ftcbasic.c | 6 +-
.../freetype2/freetype-src/src/cache/ftccache.c | 2 +-
.../freetype2/freetype-src/src/cache/ftccache.h | 2 +-
.../freetype2/freetype-src/src/cache/ftccback.h | 2 +-
.../freetype2/freetype-src/src/cache/ftccmap.c | 4 +-
.../freetype2/freetype-src/src/cache/ftcerror.h | 2 +-
.../freetype2/freetype-src/src/cache/ftcglyph.c | 2 +-
.../freetype2/freetype-src/src/cache/ftcglyph.h | 2 +-
.../freetype2/freetype-src/src/cache/ftcimage.c | 5 +-
.../freetype2/freetype-src/src/cache/ftcimage.h | 2 +-
.../freetype2/freetype-src/src/cache/ftcmanag.c | 2 +-
.../freetype2/freetype-src/src/cache/ftcmanag.h | 2 +-
.../libs/freetype2/freetype-src/src/cache/ftcmru.c | 6 +-
.../libs/freetype2/freetype-src/src/cache/ftcmru.h | 2 +-
.../freetype2/freetype-src/src/cache/ftcsbits.c | 8 +-
.../freetype2/freetype-src/src/cache/ftcsbits.h | 2 +-
.../libs/freetype2/freetype-src/src/cache/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/cff/cff.c | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffcmap.c | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffcmap.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffdrivr.c | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffdrivr.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cfferrs.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffgload.c | 84 +-
.../libs/freetype2/freetype-src/src/cff/cffgload.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffload.c | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffload.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffobjs.c | 6 +-
.../libs/freetype2/freetype-src/src/cff/cffobjs.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffparse.c | 2 +-
.../libs/freetype2/freetype-src/src/cff/cffparse.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/cfftoken.h | 2 +-
.../libs/freetype2/freetype-src/src/cff/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/cff/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/cid/ciderrs.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidgload.c | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidgload.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidload.c | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidload.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidobjs.c | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidobjs.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidparse.c | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidparse.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidriver.c | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidriver.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/cidtoken.h | 2 +-
.../libs/freetype2/freetype-src/src/cid/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/cid/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/cid/type1cid.c | 2 +-
.../libs/freetype2/freetype-src/src/dlg/dlgwrap.c | 2 +-
.../libs/freetype2/freetype-src/src/dlg/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/gxvalid/README | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvalid.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvalid.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvbsln.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvcommn.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvcommn.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxverror.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvfeat.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvfeat.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvfgen.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvjust.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvkern.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvlcar.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmod.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmod.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort0.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort1.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort2.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort4.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmort5.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx.h | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx0.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx1.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx2.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx4.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvmorx5.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvopbd.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvprop.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/gxvtrak.c | 2 +-
.../freetype2/freetype-src/src/gxvalid/module.mk | 2 +-
.../freetype2/freetype-src/src/gxvalid/rules.mk | 2 +-
.../freetype-src/src/gzip/README.freetype | 22 -
.../libs/freetype2/freetype-src/src/gzip/adler32.c | 188 +-
.../libs/freetype2/freetype-src/src/gzip/crc32.c | 444 -----
.../libs/freetype2/freetype-src/src/gzip/crc32.h | 441 -----
.../libs/freetype2/freetype-src/src/gzip/ftgzip.c | 62 +-
.../libs/freetype2/freetype-src/src/gzip/ftzconf.h | 530 ++----
.../libs/freetype2/freetype-src/src/gzip/gzguts.h | 218 ---
.../libs/freetype2/freetype-src/src/gzip/infback.c | 640 -------
.../freetype2/freetype-src/src/gzip/infblock.c | 392 ++++
.../freetype2/freetype-src/src/gzip/infblock.h | 36 +
.../freetype2/freetype-src/src/gzip/infcodes.c | 254 +++
.../freetype2/freetype-src/src/gzip/infcodes.h | 31 +
.../libs/freetype2/freetype-src/src/gzip/inffast.c | 323 ----
.../libs/freetype2/freetype-src/src/gzip/inffast.h | 11 -
.../freetype2/freetype-src/src/gzip/inffixed.h | 241 ++-
.../libs/freetype2/freetype-src/src/gzip/inflate.c | 1812 +++---------------
.../libs/freetype2/freetype-src/src/gzip/inflate.h | 130 --
.../freetype2/freetype-src/src/gzip/inftrees.c | 710 ++++---
.../freetype2/freetype-src/src/gzip/inftrees.h | 112 +-
.../libs/freetype2/freetype-src/src/gzip/infutil.c | 86 +
.../libs/freetype2/freetype-src/src/gzip/infutil.h | 98 +
.../src/gzip/patches/freetype-zlib.diff | 396 ----
.../libs/freetype2/freetype-src/src/gzip/rules.mk | 14 +-
.../libs/freetype2/freetype-src/src/gzip/zlib.h | 1935 +++++---------------
.../libs/freetype2/freetype-src/src/gzip/zutil.c | 232 +--
.../libs/freetype2/freetype-src/src/gzip/zutil.h | 194 +-
.../libs/freetype2/freetype-src/src/lzw/ftlzw.c | 4 +-
.../libs/freetype2/freetype-src/src/lzw/ftzopen.c | 2 +-
.../libs/freetype2/freetype-src/src/lzw/ftzopen.h | 2 +-
.../libs/freetype2/freetype-src/src/lzw/rules.mk | 2 +-
.../freetype2/freetype-src/src/otvalid/module.mk | 2 +-
.../freetype2/freetype-src/src/otvalid/otvalid.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvalid.h | 2 +-
.../freetype2/freetype-src/src/otvalid/otvbase.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvcommn.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvcommn.h | 2 +-
.../freetype2/freetype-src/src/otvalid/otverror.h | 2 +-
.../freetype2/freetype-src/src/otvalid/otvgdef.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvgpos.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvgpos.h | 2 +-
.../freetype2/freetype-src/src/otvalid/otvgsub.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvjstf.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvmath.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvmod.c | 2 +-
.../freetype2/freetype-src/src/otvalid/otvmod.h | 2 +-
.../freetype2/freetype-src/src/otvalid/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/pcf/pcfread.c | 25 +-
.../libs/freetype2/freetype-src/src/pfr/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfr.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrcmap.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrcmap.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrdrivr.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrdrivr.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrerror.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrgload.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrgload.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrload.c | 4 +-
.../libs/freetype2/freetype-src/src/pfr/pfrload.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrobjs.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrobjs.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrsbit.c | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrsbit.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/pfrtypes.h | 2 +-
.../libs/freetype2/freetype-src/src/pfr/rules.mk | 2 +-
.../freetype2/freetype-src/src/psaux/afmparse.c | 2 +-
.../freetype2/freetype-src/src/psaux/afmparse.h | 2 +-
.../freetype2/freetype-src/src/psaux/cffdecode.c | 2 +-
.../freetype2/freetype-src/src/psaux/cffdecode.h | 2 +-
.../freetype2/freetype-src/src/psaux/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/psaux/psaux.c | 2 +-
.../freetype2/freetype-src/src/psaux/psauxerr.h | 2 +-
.../freetype2/freetype-src/src/psaux/psauxmod.c | 2 +-
.../freetype2/freetype-src/src/psaux/psauxmod.h | 2 +-
.../libs/freetype2/freetype-src/src/psaux/psconv.c | 2 +-
.../libs/freetype2/freetype-src/src/psaux/psconv.h | 2 +-
.../freetype2/freetype-src/src/psaux/psintrp.c | 16 +-
.../libs/freetype2/freetype-src/src/psaux/psobjs.c | 79 +-
.../libs/freetype2/freetype-src/src/psaux/psobjs.h | 2 +-
.../libs/freetype2/freetype-src/src/psaux/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/psaux/t1cmap.c | 2 +-
.../libs/freetype2/freetype-src/src/psaux/t1cmap.h | 2 +-
.../freetype2/freetype-src/src/psaux/t1decode.c | 2 +-
.../freetype2/freetype-src/src/psaux/t1decode.h | 2 +-
.../freetype2/freetype-src/src/pshinter/module.mk | 2 +-
.../freetype2/freetype-src/src/pshinter/pshalgo.c | 41 +-
.../freetype2/freetype-src/src/pshinter/pshalgo.h | 2 +-
.../freetype2/freetype-src/src/pshinter/pshglob.c | 4 +-
.../freetype2/freetype-src/src/pshinter/pshglob.h | 2 +-
.../freetype2/freetype-src/src/pshinter/pshinter.c | 2 +-
.../freetype2/freetype-src/src/pshinter/pshmod.c | 2 +-
.../freetype2/freetype-src/src/pshinter/pshmod.h | 2 +-
.../freetype2/freetype-src/src/pshinter/pshnterr.h | 2 +-
.../freetype2/freetype-src/src/pshinter/pshrec.c | 105 +-
.../freetype2/freetype-src/src/pshinter/pshrec.h | 2 +-
.../freetype2/freetype-src/src/pshinter/rules.mk | 2 +-
.../freetype2/freetype-src/src/psnames/module.mk | 2 +-
.../freetype2/freetype-src/src/psnames/psmodule.c | 2 +-
.../freetype2/freetype-src/src/psnames/psmodule.h | 2 +-
.../freetype2/freetype-src/src/psnames/psnamerr.h | 2 +-
.../freetype2/freetype-src/src/psnames/psnames.c | 2 +-
.../freetype2/freetype-src/src/psnames/pstables.h | 2 +-
.../freetype2/freetype-src/src/psnames/rules.mk | 2 +-
.../freetype2/freetype-src/src/raster/ftmisc.h | 2 +-
.../freetype2/freetype-src/src/raster/ftraster.c | 2 +-
.../freetype2/freetype-src/src/raster/ftraster.h | 2 +-
.../freetype2/freetype-src/src/raster/ftrend1.c | 2 +-
.../freetype2/freetype-src/src/raster/ftrend1.h | 2 +-
.../freetype2/freetype-src/src/raster/module.mk | 2 +-
.../freetype2/freetype-src/src/raster/raster.c | 2 +-
.../freetype2/freetype-src/src/raster/rasterrs.h | 2 +-
.../freetype2/freetype-src/src/raster/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/sdf/ftbsdf.c | 36 +-
.../libs/freetype2/freetype-src/src/sdf/ftsdf.c | 99 +-
.../libs/freetype2/freetype-src/src/sdf/ftsdf.h | 2 +-
.../freetype2/freetype-src/src/sdf/ftsdfcommon.c | 2 +-
.../freetype2/freetype-src/src/sdf/ftsdfcommon.h | 4 +-
.../freetype2/freetype-src/src/sdf/ftsdferrs.h | 2 +-
.../freetype2/freetype-src/src/sdf/ftsdfrend.c | 2 +-
.../freetype2/freetype-src/src/sdf/ftsdfrend.h | 2 +-
.../libs/freetype2/freetype-src/src/sdf/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/sdf/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/sdf/sdf.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/pngshim.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/pngshim.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/rules.mk | 3 +-
.../freetype2/freetype-src/src/sfnt/sfdriver.c | 29 +-
.../freetype2/freetype-src/src/sfnt/sfdriver.h | 2 +-
.../freetype2/freetype-src/src/sfnt/sferrors.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/sfnt.c | 3 +-
.../libs/freetype2/freetype-src/src/sfnt/sfobjs.c | 80 +-
.../libs/freetype2/freetype-src/src/sfnt/sfobjs.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/sfwoff.c | 3 +-
.../libs/freetype2/freetype-src/src/sfnt/sfwoff.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/sfwoff2.c | 64 +-
.../libs/freetype2/freetype-src/src/sfnt/sfwoff2.h | 3 +-
.../libs/freetype2/freetype-src/src/sfnt/ttbdf.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttbdf.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcmap.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcmap.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcmapc.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcolr.c | 43 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcolr.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcpal.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttcpal.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttkern.c | 21 +-
.../libs/freetype2/freetype-src/src/sfnt/ttkern.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttload.c | 3 +-
.../libs/freetype2/freetype-src/src/sfnt/ttload.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttmtx.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttmtx.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttpost.c | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttpost.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttsbit.c | 37 +-
.../libs/freetype2/freetype-src/src/sfnt/ttsbit.h | 2 +-
.../libs/freetype2/freetype-src/src/sfnt/ttsvg.c | 403 ----
.../libs/freetype2/freetype-src/src/sfnt/ttsvg.h | 43 -
.../freetype2/freetype-src/src/sfnt/woff2tags.c | 2 +-
.../freetype2/freetype-src/src/sfnt/woff2tags.h | 2 +-
.../freetype2/freetype-src/src/smooth/ftgrays.c | 4 +-
.../freetype2/freetype-src/src/smooth/ftgrays.h | 2 +-
.../freetype2/freetype-src/src/smooth/ftsmerrs.h | 2 +-
.../freetype2/freetype-src/src/smooth/ftsmooth.c | 2 +-
.../freetype2/freetype-src/src/smooth/ftsmooth.h | 2 +-
.../freetype2/freetype-src/src/smooth/module.mk | 2 +-
.../freetype2/freetype-src/src/smooth/rules.mk | 2 +-
.../freetype2/freetype-src/src/smooth/smooth.c | 2 +-
.../libs/freetype2/freetype-src/src/svg/ftsvg.c | 350 ----
.../libs/freetype2/freetype-src/src/svg/ftsvg.h | 35 -
.../libs/freetype2/freetype-src/src/svg/module.mk | 23 -
.../libs/freetype2/freetype-src/src/svg/rules.mk | 70 -
.../libs/freetype2/freetype-src/src/svg/svg.c | 24 -
.../libs/freetype2/freetype-src/src/svg/svgtypes.h | 42 -
.../freetype2/freetype-src/src/tools/afblue.pl | 2 +-
.../freetype2/freetype-src/src/tools/glnames.py | 2 +-
.../freetype-src/src/tools/update-copyright-year | 2 +-
.../freetype2/freetype-src/src/truetype/module.mk | 2 +-
.../freetype2/freetype-src/src/truetype/rules.mk | 2 +-
.../freetype2/freetype-src/src/truetype/truetype.c | 2 +-
.../freetype2/freetype-src/src/truetype/ttdriver.c | 2 +-
.../freetype2/freetype-src/src/truetype/ttdriver.h | 2 +-
.../freetype2/freetype-src/src/truetype/tterrors.h | 2 +-
.../freetype2/freetype-src/src/truetype/ttgload.c | 219 +--
.../freetype2/freetype-src/src/truetype/ttgload.h | 2 +-
.../freetype2/freetype-src/src/truetype/ttgxvar.c | 18 +-
.../freetype2/freetype-src/src/truetype/ttgxvar.h | 2 +-
.../freetype2/freetype-src/src/truetype/ttinterp.c | 54 +-
.../freetype2/freetype-src/src/truetype/ttinterp.h | 2 +-
.../freetype2/freetype-src/src/truetype/ttobjs.c | 7 +-
.../freetype2/freetype-src/src/truetype/ttobjs.h | 4 +-
.../freetype2/freetype-src/src/truetype/ttpload.c | 52 +-
.../freetype2/freetype-src/src/truetype/ttpload.h | 2 +-
.../freetype2/freetype-src/src/truetype/ttsubpix.c | 2 +-
.../freetype2/freetype-src/src/truetype/ttsubpix.h | 2 +-
.../freetype2/freetype-src/src/type1/module.mk | 2 +-
.../libs/freetype2/freetype-src/src/type1/rules.mk | 2 +-
.../libs/freetype2/freetype-src/src/type1/t1afm.c | 2 +-
.../libs/freetype2/freetype-src/src/type1/t1afm.h | 2 +-
.../freetype2/freetype-src/src/type1/t1driver.c | 2 +-
.../freetype2/freetype-src/src/type1/t1driver.h | 2 +-
.../freetype2/freetype-src/src/type1/t1errors.h | 2 +-
.../freetype2/freetype-src/src/type1/t1gload.c | 2 +-
.../freetype2/freetype-src/src/type1/t1gload.h | 2 +-
.../libs/freetype2/freetype-src/src/type1/t1load.c | 8 +-
.../libs/freetype2/freetype-src/src/type1/t1load.h | 2 +-
.../libs/freetype2/freetype-src/src/type1/t1objs.c | 2 +-
.../libs/freetype2/freetype-src/src/type1/t1objs.h | 2 +-
.../freetype2/freetype-src/src/type1/t1parse.c | 2 +-
.../freetype2/freetype-src/src/type1/t1parse.h | 2 +-
.../freetype2/freetype-src/src/type1/t1tokens.h | 2 +-
.../libs/freetype2/freetype-src/src/type1/type1.c | 2 +-
.../freetype2/freetype-src/src/type42/module.mk | 2 +-
.../freetype2/freetype-src/src/type42/rules.mk | 2 +-
.../freetype2/freetype-src/src/type42/t42drivr.c | 15 +-
.../freetype2/freetype-src/src/type42/t42drivr.h | 2 +-
.../freetype2/freetype-src/src/type42/t42error.h | 2 +-
.../freetype2/freetype-src/src/type42/t42objs.c | 17 +-
.../freetype2/freetype-src/src/type42/t42objs.h | 2 +-
.../freetype2/freetype-src/src/type42/t42parse.c | 63 +-
.../freetype2/freetype-src/src/type42/t42parse.h | 2 +-
.../freetype2/freetype-src/src/type42/t42types.h | 2 +-
.../freetype2/freetype-src/src/type42/type42.c | 2 +-
.../freetype2/freetype-src/src/winfonts/fnterrs.h | 2 +-
.../freetype2/freetype-src/src/winfonts/module.mk | 2 +-
.../freetype2/freetype-src/src/winfonts/rules.mk | 2 +-
.../freetype2/freetype-src/src/winfonts/winfnt.c | 6 +-
.../freetype2/freetype-src/src/winfonts/winfnt.h | 2 +-
.../libs/freetype2/freetype-src/vms_make.com | 2 +-
Build/source/libs/freetype2/version.ac | 2 +-
691 files changed, 4432 insertions(+), 17865 deletions(-)
delete mode 100644 Build/source/libs/freetype2/freetype-src/docs/reference/ft2-ot_svg_driver.html
delete mode 100644 Build/source/libs/freetype2/freetype-src/docs/reference/ft2-svg_fonts.html
delete mode 100644 Build/source/libs/freetype2/freetype-src/include/freetype/internal/svginterface.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/include/freetype/otsvg.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/README.freetype
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/crc32.c
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/crc32.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/gzguts.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infback.c
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infblock.c
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infblock.h
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infcodes.c
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infcodes.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/inffast.c
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/inffast.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/inflate.h
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infutil.c
create mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/infutil.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/gzip/patches/freetype-zlib.diff
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/sfnt/ttsvg.c
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/sfnt/ttsvg.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/ftsvg.c
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/ftsvg.h
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/module.mk
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/rules.mk
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/svg.c
delete mode 100644 Build/source/libs/freetype2/freetype-src/src/svg/svgtypes.h
(limited to 'Build/source/libs/freetype2')
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 1ca6903cacc..55e3f3e178f 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,8 +1,3 @@
-2022-04-05 Akira Kakuto
-
- Import freetype-2.12.0.
- * version.ac: Adjusted.
-
2021-12-03 Akira Kakuto
Import freetype-2.11.1.
diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog
index 563d345e802..a9b133960e0 100644
--- a/Build/source/libs/freetype2/TLpatches/ChangeLog
+++ b/Build/source/libs/freetype2/TLpatches/ChangeLog
@@ -1,7 +1,3 @@
-2022-04-05 Akira Kakuto
2021-12-03 Akira Kakuto
Import freetype-2.11.1 source tree from:
diff --git a/Build/source/libs/freetype2/TLpatches/TL-Changes b/Build/source/libs/freetype2/TLpatches/TL-Changes
index 3fd45f34946..19c131081bc 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.12.0/ tree as obtained from:
+Changes applied to the freetype-2.11.1/ tree as obtained from:
http://download.savannah.gnu.org/releases/freetype/.
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index 20a933cdfca..1f538299af1 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.71 for FreeType (TeX Live) 2.12.0.
+# Generated by GNU Autoconf 2.71 for FreeType (TeX Live) 2.11.1.
#
# Report bugs to .
#
@@ -610,8 +610,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType (TeX Live)'
PACKAGE_TARNAME='freetype--tex-live-'
-PACKAGE_VERSION='2.12.0'
-PACKAGE_STRING='FreeType (TeX Live) 2.12.0'
+PACKAGE_VERSION='2.11.1'
+PACKAGE_STRING='FreeType (TeX Live) 2.11.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1278,7 +1278,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.12.0 to adapt to many kinds of systems.
+\`configure' configures FreeType (TeX Live) 2.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType (TeX Live) 2.12.0:";;
+ short | recursive ) echo "Configuration of FreeType (TeX Live) 2.11.1:";;
esac
cat <<\_ACEOF
@@ -1443,7 +1443,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType (TeX Live) configure 2.12.0
+FreeType (TeX Live) configure 2.11.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1566,7 +1566,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.12.0, which was
+It was created by FreeType (TeX Live) $as_me 2.11.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4100,7 +4100,7 @@ fi
# Define the identity of the package.
PACKAGE='freetype--tex-live-'
- VERSION='2.12.0'
+ VERSION='2.11.1'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5834,7 +5834,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.12.0, which was
+This file was extended by FreeType (TeX Live) $as_me 2.11.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5893,7 +5893,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-FreeType (TeX Live) config.status 2.12.0
+FreeType (TeX Live) config.status 2.11.1
configured by $0, generated by GNU Autoconf 2.71,
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 7168cc14d2a..4335d66dc33 100644
--- a/Build/source/libs/freetype2/freetype-src/CMakeLists.txt
+++ b/Build/source/libs/freetype2/freetype-src/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt
#
-# Copyright (C) 2013-2022 by
+# Copyright (C) 2013-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written originally by John Cary
@@ -106,9 +106,10 @@
# (this is compatible with the same CMake variables in zlib's CMake
# support).
-# To minimize the number of cmake_policy() workarounds,
-# CMake >= 3 is requested.
-cmake_minimum_required(VERSION 3.0)
+# FreeType explicitly marks the API to be exported and relies on the compiler
+# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
+# starting with 2.8.12.
+cmake_minimum_required(VERSION 2.8.12)
if (NOT CMAKE_VERSION VERSION_LESS 3.3)
# Allow symbol visibility settings also on static libraries. CMake < 3.3
@@ -121,7 +122,6 @@ endif ()
include(CheckIncludeFile)
include(CMakeDependentOption)
-include(FindPkgConfig)
# CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which
# configures the base build environment and references the toolchain file
@@ -162,8 +162,8 @@ endif ()
project(freetype C)
set(VERSION_MAJOR "2")
-set(VERSION_MINOR "12")
-set(VERSION_PATCH "0")
+set(VERSION_MINOR "11")
+set(VERSION_PATCH "1")
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
@@ -239,7 +239,7 @@ if (BUILD_FRAMEWORK)
message(FATAL_ERROR
"You should use Xcode generator with BUILD_FRAMEWORK enabled")
endif ()
- set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+ set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)")
set(BUILD_SHARED_LIBS ON)
endif ()
@@ -271,16 +271,11 @@ if (NOT FT_DISABLE_ZLIB)
endif ()
if (NOT FT_DISABLE_BZIP2)
- # Genuine BZip2 does not provide bzip2.pc, but some platforms have it.
- # For better dependency in freetype2.pc, bzip2.pc is searched
- # regardless of the availability of libbz2. If bzip2.pc is found,
- # Requires.private is used instead of Libs.private.
if (FT_REQUIRE_BZIP2)
find_package(BZip2 REQUIRED)
else ()
find_package(BZip2)
endif ()
- pkg_check_modules(PC_BZIP2 bzip2)
endif ()
if (NOT FT_DISABLE_BROTLI)
@@ -405,7 +400,6 @@ set(BASE_SRCS
src/sdf/sdf.c
src/sfnt/sfnt.c
src/smooth/smooth.c
- src/svg/svg.c
src/truetype/truetype.c
src/type1/type1.c
src/type42/type42.c
@@ -509,11 +503,7 @@ endif ()
if (BZIP2_FOUND)
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
- if (PC_BZIP2_FOUND)
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2")
- else ()
- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
- endif ()
+ list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
endif ()
if (PNG_FOUND)
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
diff --git a/Build/source/libs/freetype2/freetype-src/ChangeLog b/Build/source/libs/freetype2/freetype-src/ChangeLog
index cc7c5f36147..e419b471e0c 100644
--- a/Build/source/libs/freetype2/freetype-src/ChangeLog
+++ b/Build/source/libs/freetype2/freetype-src/ChangeLog
@@ -1,1369 +1,3 @@
-2022-03-31 Werner Lemberg
-
- * Version 2.12.0 released.
- ==========================
-
- Tag sources with `VER-2-12-0'.
-
- * docs/VERSION.TXT: Add entry for version 2.12.0.
- * docs/CHANGES, docs/release: 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.11.1/2.12.0/, s/2111/2120/.
-
- * include/freetype/freetype.h (FREETYPE_MINOR): Set to 12.
- (FREETYPE_PATCH): Set to 0.
-
- * builds/unix/configure.raw (version_info): Set to 24:2:18.
- * CMakeLists.txt (VERSION_MINOR): Set to 12.
- (VERSION_PATCH): Set to 0.
-
- * builds/toplevel.mk (do-dist): Generate `ChangeLog` entries for all commits
- since version 2.11.0 (when we stopped creating this file manually).
-
-2022-03-31 Werner Lemberg
-
- Fix clang++ warnings.
-
- * src/base/ftglyph.c (ft_svg_glyph_prepare), src/base/ftobj.c
- (ft_glyphslot_init), src/cache/ftccmap.c (ftc_cmap_node_new),
- src/cache/ftcimage.c (FTC_INode_New), src/lzw/ftlzw.c (FT_Stream_OpenLZW),
- src/psaux/psobjs.c (ps_parser_load_field), src/pshinter/pshglob.c
- (psh_globals_new), src/sfnt/ttsvg.c (tt_face_load_svg_doc): Initialize
- variables used for allocation.
-
- * src/sdf/ftsdf.c (split_sdf_conic, split_sdf_cubic): Change type of
- `max_splits` to FT_UInt.
- (sdf_generate_bounding_box): Add cast.
-
-2022-03-30 Werner Lemberg
-
- Whitespace.
-
-2022-03-30 Werner Lemberg
-
- [builds] Fix creation of `freetype2.pc` for static-only builds.
-
- We have to help `pkg-config` since it can't recognize that there is no
- shared library installed.
-
- Note that meson already does exactly the same.
-
- * builds/unix/configure.raw (REQUIRES_PRIVATE, LIBS_PRIVATE): Rename to...
- (PKGCONFIG_REQUIRES_PRIVATE, PKGCONFIG_LIBS_PRIVATE): This. Adjust them
- depending on `$enable_shared`.
- (PKGCONFIG_REQUIRES, PKGCONFIG_LIBS): New variables.
-
- * builds/unix/freetype2.in, builds/unix/unix-def.in: Use new and updated
- variables.
-
-2022-03-25 Werner Lemberg
-
- Add `FT_FACE_FLAG_SBIX_OVERLAY` and `FT_HAS_SBIX_OVERLAY`.
-
- * include/freetype/freetype.h (FT_FACE_FLAG_SBIX_OVERLAY,
- FT_HAS_SBIX_OVERLAY): New macro.
-
- * src/sfnt/ttsbit.c (tt_face_load_sbit): Handle `FT_FACE_FLAG_SBIX_OVERLAY`.
- Remove obsolete tracing message.
-
-2022-03-25 Werner Lemberg
-
- Add `FT_PARAM_TAG_IGNORE_SBIX`.
-
- This is another bit to handle 'sbix' tables as described in the OpenType
- specification.
-
- * include/freetype/ftparams.h (FT_PARAM_TAG_IGNORE_SBIX): New macro.
-
- * src/sfnt/sfobjc.c (is_apple_sbix): Rename to...
- (has_sbix): ... this.
- Check for more sbit tables.
- Handle `FT_PARAM_TAG_IGNORE_SBIX` to eventually control `has_sbix`.
- Only call sbit table loader if an sbit table is present.
-
-2022-03-25 Werner Lemberg
-
- [truetype] Fix 'sbix' table handling.
-
- * src/sfnt/ttsbit.c (tt_face_load_sbix_image): Correct calculation of
- 'metrics->horiBearingY'.
- Set vertical metrics.
-
- * src/sfnt/sfobjs.c (sfnt_load_face): Adjust setting of `FT_FACE_FLAG_SBIX`.
- Handle metrics of fonts with 'sbix' table.
-
- * src/truetype/ttgload.c (TT_Load_Glyph): For 'sbix' embedded bitmaps, apply
- bbox offset and bearing values of the corresponding glyph in the 'glyf'
- table if it exists and has a contour.
-
- * src/truetype/ttobjs.c (tt_face_init): Handle font with 'sbix' table.
-
- Fixes issue #998.
-
-2022-03-25 Werner Lemberg
-
- Add `FT_FACE_FLAG_SBIX` and `FT_HAS_SBIX`.
-
- Fonts with 'sbix' tables need special handling by the application.
-
- * include/freetype/freetype.h (FT_FACE_FLAG_SBIX, FT_HAS_SBIX): New macros.
-
- * src/sfnt/sfobjs.c (sfnt_load_face): Set `FT_FACE_FLAG_SBIX` if 'sbix'
- table is present.
-
-2022-03-25 Werner Lemberg
-
- * include/freetype/freetype.h (FT_LOAD_SBITS_ONLY): Tag macro as public.
-
-2022-03-24 Carlo Bramini
-
- [builds/windows] Fix WCE support.
-
- * builds/windows/ftsystem.c [_WIN32_WCE]: Include needed by
- _alloca.
-
-2022-03-24 Steve Lhomme
-
- [build/windows] Improve UWP support.
-
- * builds/windows/ftsystem.c [UWP]: Wrap CreateFile2 into CreateFileA.
-
-2022-03-21 Werner Lemberg
-
- * src/sfnt/ttkern.c (tt_face_get_kerning): Exit early if no table.
-
- Fixes #1141.
-
-2022-03-20 Ben Wagner
-
- [woff2] Support overlap flag for simple glyphs.
-
- In the woff2 spec it has been proposed to allow the OVERLAP_SIMPLE flag
- to be retained through the woff2 format [0].
-
- [0] https://www.w3.org/TR/WOFF2/#glyf_table_format
-
- * src/sfnt/sfwoff2.h (GLYF_OVERLAP_SIMPLE): add glyf flag.
-
- * src/sfnt/sfwoff2.c (reconstruct_glyf): parse optionFlags and
- overlapSimpleBitmap[]. (store_points): set OVERLAP_SIMPLE on first point's
- flag if the overlap bit is set.
-
-2022-03-19 Werner Lemberg
-
- [cff] Synchronize `cff_slot_load` with `TT_Load_Glyph`.
-
- * src/cff/cffgload.c (IS_DEFAULT_INSTANCE): New macro.
- (cff_slot_load): Use it.
-
-2022-03-19 Werner Lemberg
-
- * src/base/ftobjs.c (FT_Request_Size): Guard `face->size`.
-
- Fixes #1140.
-
-2022-03-19 Werner Lemberg
-
- * src/base/ftobjs.c (ft_open_face_internal): Thinko.
-
-2022-03-19 Ben Wagner
-
- [doc] FT_OUTLINE_OVERLAP was introduced in 2.10.3.
-
- * include/freetype/ftimage.h (FT_OUTLINE_OVERLAP): Document when added.
-
-2022-03-19 Werner Lemberg
-
- * src/base/ftobjs.c (ft_open_face_internal): Properly guard `face_index`.
-
- We must ensure that the cast to `FT_Int` doesn't change the sign.
-
- Fixes #1139.
-
-2022-03-17 Werner Lemberg
-
- [sfnt] Avoid invalid face index.
-
- Fixes #1138.
-
- * src/sfnt/sfobjs.c (sfnt_init_face), src/sfnt/sfwoff2.c (woff2_open_font):
- Check `face_index` before decrementing.
-
-2022-03-07 Werner Lemberg
-
- Documentation, whitespace.
-
-2022-03-05 Anuj Verma
-
- [sdf] Fix corner checks and improve performance.
-
- * src/sdf/ftsdf.c (sdf_generate_bounding_box): Always check for a corner if
- two distances (for different curves) are very close.
-
- (sdf_conic_to): Check whether the conic curve can be treated as a line
- (which happens if the control point coincides with any end point).
-
-2022-03-05 Anuj Verma
-
- [sdf] Implement deviation-based splitting for Bezier curves.
-
- * src/sdf/ftsdf.c (split_sdf_cubic, split_sdf_shape): Add checks to figure
- out the deviation of Bezier curves and stop splitting if the curve is flat
- enough.
-
- * src/sdf/ftsdfcommon.h (ONE_PIXEL): New macro.
-
-2022-03-05 Anuj Verma
-
- * include/freetype/freetype.h: Improve SDF documentation.
-
-2022-03-03 Ben Wagner
-
- [sfnt] Fix bounds check in SVG.
-
- The `SVG_DOCUMENT_LIST_MINIMUM_SIZE` macro is non trivial and not
- protected by parentheses. As a result, the expression
- `table_size - SVG_DOCUMENT_LIST_MINIMUM_SIZE` expands to
- `table_size - 2U + SVG_DOCUMENT_RECORD_SIZE` instead of the expected
- `table_size - (2U + SVG_DOCUMENT_RECORD_SIZE)`. This causes an incorrect
- bounds check which may lead to reading past the end of the `SVG ` table.
-
- * src/sfnt/ttsvg.c (tt_face_load_svg): wrap macro definitions in
- parentheses.
-
- Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=45179
-
-2022-02-23 Ben Wagner
-
- [psaux] Full bounds check for OtherSubr 19.
-
- It is possible for OtherSubr 19 to be invoked when `decoder->buildchar` is
- NULL (so that `decoder->len_buildchar` is 0), the `blend` is non-NULL with
- `blend->num_designs` set to 2, and the user supplied `idx` to be large (for
- example 0xFFFFFFFE). Since these are all `FT_UInt32` the existing bounds
- check overflows in a well defined manner, allowing for an invalid call to
- `memcpy`.
-
- In addition, it is possible to call OtherSubr 19 with
- `decoder->len_buildchar`, `blend->num_designs`, and `idx` all zero (implying
- that `blend->weight_vector` and `decoder->buildchar` are NULL). This passes
- the bounds check (it is logically always fine to copy nothing starting at
- index zero) but may invoke undefined behavior in `ft_memcpy` if it is backed
- by `memcpy`. Calling `memcpy` with either the `src` or `dst` NULL is
- undefined behavior (even if `count` is zero).
-
- * src/psaux/psintrp.c (cf2_interpT2CharString): Correctly check that
- `blend->num_designs` can be copied to `decoder->buildchar[idx]`.
- Also avoid passing NULL to `ft_memcpy`.
-
- Bug: https://crbug.com/1299259
-
-2022-02-21 suzuki toshiya
-
- [cmake] Drop the support of CMake 2.x.
-
- * CMakeLists.txt: Require CMake 3.0 (released on 2014) or newer.
-
- The issue #1059 reports the difficulty to support both of
- CMake 2.x and newer one by single CMakeLists.txt without
- the inflation of cmake_policy() workarounds.
-
- For better maintainability, the support of CMake 2.x is
- dropped.
-
-2022-02-19 Werner Lemberg
-
- * src/bdf/README: Updated.
-
-2022-02-19 Werner Lemberg
-
- * builds/mac/ftmac.c, src/base/ftmac.c: s|FT_MAC_H||.
-
-2022-02-19 Werner Lemberg
-
- src/sfnt/ttkern.c (tt_face_load_kern): Micro-optimize.
-
- A kerning table can be handled by binary search if it has equal entries.
-
- Fixes #1132.
-
-2022-02-17 Steve Lhomme
- Alexei Podtelezhnikov
-
- [builds/windows] Add support for legacy UWP builds.
-
- * builds/windows/ftsystem.c: Add neccessary macro substitutions to
- enable strict UWP builds.
-
- See !141.
-
-2022-02-16 Werner Lemberg
-
- ftmm.h: Minor documentation improvement.
-
-2022-02-13 Alexei Podtelezhnikov
-
- [pshinter] Tune PSH_STRONG_THRESHOLD_MAXIMUM value.
-
- Before the change, the hinting engine frequently confused horizontal
- stem and serif hints making some stems too thin and some serifs too
- thick. The value was tuned using serif fonts from the URW+ base 35
- collection.
-
- * src/pshinter/pshalgo.c [PSH_STRONG_THRESHOLD_MAXIMUM]: s/30/12/.
-
-2022-02-12 Werner Lemberg
-
- t1tables.h: Documentation improvements.
-
-2022-02-12 Werner Lemberg
-
- t1tables.h: Whitespace.
-
-2022-02-11 Werner Lemberg
-
- [type42] Fix `FT_Get_PS_Font_Private` for this format.
-
- Since Type42 fonts don't have a 'Private' dictionary, the return value
- should be `FT_Err_Invalid_Argument`.
-
- * src/type42/t42drivr.c (t42_ps_get_font_private): Removed.
- (t42_service_ps_info): Updated.
-
-2022-02-09 Alexei Podtelezhnikov
-
- [pshinter] Clear reused mask.
-
- In PS hinter, memory allocations persist until the module is done.
- Therefore, we have to clear reused masks.
-
- * src/pshinter/pshrec.c (ps_mask_table_alloc): Clear reused mask.
-
-2022-02-09 Alexei Podtelezhnikov
-
- [pshinter] Use unsigned indices.
-
- This reduces casting and eliminates some checks.
-
- * src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_table_merge,
- ps_dimension_add_t1stem, ps_hints_t1stem3): Updated.
- (ps_dimension_add_counter): Updated, unnecessary checks removed.
-
-2022-02-08 Alexei Podtelezhnikov
-
- [pshinter] Fix mask merging.
-
- We forgot to update the number of bits when merging a larger mask
- into a smaller one. This fix might have rendering effects.
-
- * src/pshinter/pshrec.c (ps_mask_table_merge): Inherit the number
- of bits from a larger mask. There is no need to zero unused bits,
- already zeroed during allocation.
- (ps_mask_clear_bit): Removed.
- (ps_mask_ensure): Minor.
-
-2022-02-08 Alexei Podtelezhnikov
-
- [pshinter] Revise the hint table handling.
-
- * src/pshinter/pshrec.c (ps_hint_table_ensure): Remove redundant size
- check; avoid array zeroing because it is fully initialized when used.
- (ps_hint_table_alloc): Fix off-by-one comparison and remove another
- zeroing of the array elements.
-
-2022-02-06 Werner Lemberg
-
- Various minor doc fixes.
-
-2022-02-06 Alexei Podtelezhnikov
-
- [builds/windows] Add SVG to to project files.
-
- * builds/windows/vc2010/freetype.vcxproj: Updated.
- * builds/windows/vc2010/freetype.vcxproj.filters: Updated.
- * builds/windows/visualc/freetype.vcproj: Updated.
-
-2022-02-03 Alexei Podtelezhnikov
-
- * src/winfonts/winfnt.c (fnt_face_get_dll_font): Trace font resources.
-
-2022-02-02 Eric Jing <@CPUcontrol>
-
- [cmake] Fix build on MacOS.
-
- * CMakeLists.txt (CMAKE_OSX_ARCHITECTURES): Update value to fix the building
- of a framework on MacOS.
-
- * builds/mac/freetype-Info.plist (CFBundleExecutable): Make identifier
- lowercase only.
-
- Fixes #1127.
-
-2022-02-02 Alexei Podtelezhnikov
-
- [psaux] Revise `PS_Table` handling.
-
- The old impleemntation was not using `FT_REALLOC`, buing too careful
- with the offset rebasing. It shoudl be safe to rely on the base
- movements.
-
- * src/psaux/psobjs.c (reallocate_t1_table, shift_elements): Combine
- into...
- (ps_table_realloc): ... this function based on `FT_REALLOC`.
- (ps_table_done): Simplified.
- (ps_table_add): Updated.
-
-2022-02-02 Alexei Podtelezhnikov
-
- * src/cache/ftcmru.c (FTC_MruList_New): Explain zeroing.
-
-2022-01-31 Alexei Podtelezhnikov
-
- [cache] Partially revert 9870b6c07e2c.
-
- Fix crashes reported by Werner.
-
- * src/cache/ftcmru.c (FTC_MruList_New): Use `FT_ALLOC` again.
-
-2022-01-31 Werner Lemberg
-
- freetype.h: Minor documentation improvement.
-
-2022-01-31 Alexei Podtelezhnikov
-
- [cache] Fix fallouts from edd4fedc5427.
-
- Reported by Werner.
-
- * src/cache/ftcimage.c (FTC_INode_New): Always initialize FT_Glyph.
- * src/cache/ftcsbits.c (FTC_SNode_New): Always initialize FT_SBit.
-
-2022-01-31 Alexei Podtelezhnikov
-
- Clean-up - do not doubt FT_FREE.
-
- * src/base/ftobjs.c (memory_stream_close): Do not reassign zero
- after `FT_FREE`.
- * src/sfnt/sfwoff.c (sfnt_stream_close): Ditto.
- * src/sfnt/sfwoff2.c (stream_close): Ditto.
- * src/psaux/psobjs.c (ps_parser_load_field): Ditto.
- * src/truetype/ttgxvar.c (ft_var_load_avar, tt_set_mm_blend,
- tt_set_mm_blend): Ditto.
-
-2022-01-30 Werner Lemberg
-
- * CMakeLists.txt: Include 'FindPkgConfig' module.
-
- Older cmake versions don't provide `pkg_check_modules` by default.
-
- Fixes #1126.
-
-2022-01-30 Alexei Podtelezhnikov
-
- * src/psaux/psobjs.c (ps_parser_load_field): Reduce `string` scope.
-
-2022-01-29 suzuki toshiya
-
- [cmake] Check the availability of `bzip2.pc'.
-
- (CMakeLists.txt): Check the availability of `bzip2.pc'.
-
- * If `bzip2.pc' is available, Requires.private should include
- bzip2, but Libs.private should not include -lbz2.
-
- * If `bzip2.pc' is unavailable, Requires.private cannot include
- bzip2, but Libs.private should include -lbz2.
-
- Fix #897.
-
-2022-01-28 Werner Lemberg
-
- * unix/configure.raw: We need 'librsvg' version 2.46.0 or newer.
-
- Older versions don't have function `rsvg_handle_get_intrinsic_dimensions`.
-
-2022-01-28 Alexei Podtelezhnikov
-
- Minor clean-ups.
-
- * src/base/ftrfork.c (raccess_make_file_name): Do not set error.
- * src/sfnt/sfdriver.c (get_win_string, get_apple_string): Ditto.
- * src/cff/cffobjs.c (cff_strcpy): Do not confuse about error.
- * src/psaux/psobjs.c (ps_table_done): Ditto.
- * src/truetype/ttgxvar.c (ft_var_readpacked*, ft_var_load_avar): Ditto.
-
-2022-01-27 Ben Wagner
-
- Document `FT_Outline_Decompose` degenerate segments.
-
- `FT_Outline_Decompose` does not filter out and can return degenerate
- segments in an outline. This can be surprising when attemping to
- stroke such an outline. Clarify the existing documentation on this
- matter to cover all forms of degeneracy (without specifying exactly
- how they will be reported), why they might arise, and better explain in
- what cases they may be an issue.
-
- * include/freetype/ftoutlin.h (FT_Outline_Decompose): update
- documentation.
-
- Fixes #952.
-
-2022-01-27 Anuj Verma
-
- Fix sdf computation while `USE_SQUARED_DISTANCES`.
-
- Function `map_fixed_to_sdf` expects spread to be absolute
- and not squared.
-
- * src/sdf/ftbsdf.c (finalize_sdf): Pass absolute spread
- while `map_fixed_to_sdf`.
-
- * src/sdf/ftsdf.c (sdf_generate_bounding_box): Ditto.
-
-2022-01-27 Tapish Ojha
-
- [sfnt] Improve sRGB constants.
-
- * src/base/ftbitmap.c (ft_gray_for_premultiplied_srgb_bgra): Use slightly
- more precise values.
-
- Fixes #1018.
-
-2022-01-27 Werner Lemberg
-
- docs/release: Updated.
-
-2022-01-26 Alexei Podtelezhnikov
-
- * src/pfr/pfrload.c (pfr_phy_font_load): Use FT_QNEW_ARRAY.
-
-2022-01-26 Alexei Podtelezhnikov
-
- * src/sdf/ftsdf.c (sdf_*_new): Use standard macro.
-
-2022-01-26 Alexei Podtelezhnikov
-
- [pcf] Delay encoding allocation and avoid its zeroing.
-
- * src/pcf/pcfread.c (pcf_get_encodings): Refactor and use FT_QNEW_ARRAY.
-
-2022-01-25 Werner Lemberg
-
- Aarg, typo.
-
-2022-01-25 Werner Lemberg
-
- freetype.h: More updates to `FT_LOAD_COLOR` description.
-
-2022-01-25 Werner Lemberg
-
- * builds/unix/configure.raw (FT_DEMO_CFLAGS): Pass `-DHAVE-LIBRSVG`.
-
- This helps in decoupling library support from `pkg-config` for other
- platforms.
-
-2022-01-25 Werner Lemberg
-
- Update documentation for `FT_LOAD_COLOR`.
-
-2022-01-24 Ben Wagner
-
- [pshinter] Ensure all point flags are initialized.
-
- Only off curve point flags were fully initialized.
-
- * src/pshinter/pshalgo.c (psh_glyph_init): always initialize flags.
-
- Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43930
-
-2022-01-24 Werner Lemberg
-
- .mailmap: Typo.
-
-2022-01-23 Werner Lemberg
-
- * src/svg/ftsvg.c (ft_svg_property_set): Disallow NULL pointers.
-
-2022-01-23 Werner Lemberg
-
- .mailmap: Updated.
-
-2022-01-23 Werner Lemberg
-
- More documentation on handling OT-SVG.
-
-2022-01-23 Werner Lemberg
-
- * src/svg/ftsvg.c: Rename `svg_hooks` to `svg-hooks` for consistency.
-
-2022-01-22 Werner Lemberg
-
- [sfnt] Reject malformed SVG tables.
-
- * src/sfnt/ttsvg.c (SVG_TABLE_HEADER_SIZE, SVG_DOCUMENT_RECORD_SIZE,
- SVG_DOCUMENT_LIST_MINIMUM_SIZE, SVG_MINIMUM_SIZE): New macros.
- (tt_face_load_svg): Check offsets.
- Check table and record sizes.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43918
-
-2022-01-22 Alexei Podtelezhnikov
-
- * src/psaux/psobjs.c (ps_table_new): Revert to zeroing.
-
-2022-01-20 Alexei Podtelezhnikov
-
- [psaux, type1, type42] Avoid annecessary zeroing.
-
- * src/psaux/psobjs.c (ps_table_new): Use FT_QNEW_ARRAY.
- * src/type1/t1load.c (parse_encoding): Ditto.
- * src/type42/t42parse.c (t42_parse_encoding): Ditto.
-
-2022-01-20 Werner Lemberg
-
- [builds/unix] Handle 'librsvg' for demo programs.
-
- * builds/unix/configure.raw: Check for 'librsvg'.
- (LIB_CLOCK_GETTIME): Don't call `AC_SUBST` on this but on...
- (FT_DEMO_CFLAGS, FT_DEMO_LDFLAGS): ... these two new variables.
-
- * builds/unix/unix-cc.in (LIB_CLOCK_GETTIME): Replaced by...
- (FT_DEMO_CFLAGS, FT_DEMO_LDFLAGS): ... these two new variables.
-
-2022-01-20 Moazin Khatti
-
- Add 'svg' module for OT-SVG rendering.
-
- * CMakeLists.txt (BASE_SRCS): Add svg module file.
- * meson.build (ft2_public_headers): Add `otsvg.h`.
-
- * modules.cfg (RASTER_MODULES): Add `svg` module.
-
- * builds/meson/parse_modules_cfg.py: Add svg module.
-
- * include/freetype/config/ftmodule.h: Add `ft_svg_renderer_class`.
- * include/freetype/fterrdef.h: Add `Invalid_SVG_Document` and
- `Missing_SVG_Hooks` error codes.
- * include/freetype/internal/fttrace.h: Add tracing for `otsvg`.
- * include/freetype/internal/svginterface.h: New file. It adds an interface
- to enable the presetting hook from the `base` module.
- * include/freetype/otsvg.h (SVG_Lib_Init_Func, SVG_Lib_Free_Func,
- SVG_Lib_Render_Func, SVG_Lib_Preset_Slot_Func): New hooks for SVG rendering.
- (SVG_RendererHooks): New structure to access them.
-
- * src/base/ftobjs.c: Include `svginterface.h`.
- (ft_glyphslot_preset_bitmap): Add code for presetting the slot for SVG
- glyphs.
- (ft_add_renderer): Updated.
-
- * src/svg/*: New files.
-
-2022-01-20 Moazin Khatti
-
- Add `FT_Glyph` support for OT-SVG glyphs.
-
- * include/freetype/ftglyph.h (FT_SvgGlyphRec, FT_SvgGlyph): New structure.
-
- * src/base/ftglyph.c: Include `otsvg.h`.
- (ft_svg_glyph_init, ft_svg_glyph_done, ft_svg_glyph_copy,
- ft_svg_glyph_transform, ft_svg_glyph_prepare): New function.
- (ft_svg_glyph_class): New class.
- (FT_New_Glyph, FT_Glyph_To_Bitmap): Updated to handle OT-SVG glyphs.
- * src/base/ftglyph.h: Updated.
-
-2022-01-20 Moazin Khatti
-
- [truetype, cff] Add code to load SVG document.
-
- * src/cff/cffgload.c (cff_slot_load): Add code to load SVG doc.
- * src/truetype/ttgload.c (TT_Load_Glyph): Add code to load SVG doc.
-
-2022-01-20 Moazin Khatti
-
- Add code to load OT-SVG glyph documents.
-
- * include/freetype/config/ftheader.h (FT_OTSVG_H): New macro.
- * include/freetype/freetype.h (FT_FACE_FLAG_SVG, FT_HAS_SVG): New macros.
- (FT_LOAD_SVG_ONLY): New internal macro.
- * include/freetype/ftimage.h (FT_Glyph_Format): New enumeration value
- `FT_GLYPH_FORMAT_SVG`.
- * include/freetype/internal/ftobjs.h (FT_GLYPH_OWN_GZIP_SVG): New macro.
- * include/freetype/internal/fttrace.h: Add `ttsvg` for `ttsvg.c`.
- * include/freetype/internal/sfnt.h(load_svg, free_svg, load_svg_doc): New
- functions.
- * include/freetype/internal/tttypes.h (TT_FaceRec): Add `svg` for
- the SVG table.
- * include/freetype/otsvg.h (FT_SVG_DocumentRec): New structure to hold the
- SVG document and other necessary information of an OT-SVG glyph in a glyph
- slot.
- * include/freetype/tttags.h (TTAG_SVG): New macro.
-
- * src/base/ftobjs.c: Include `otsvg.h`.
- (ft_glyphslot_init): Allocate `FT_SVG_DocumentRec` in `slot->other`
- if the SVG table exists.
- (ft_glyphslot_clear): Free it upon clean-up if it is a GZIP compressed
- glyph.
- (ft_glyphslot_done): Free the document data if it is a GZIP compressed
- glyph.
- (FT_Load_Glyph): Don't auto-hint SVG documents.
-
- * src/cache/ftcbasic.c (ftc_basic_family_load_glyph): Add support for
- FT_GLYPH_FORMAT_SVG.
-
- * src/sfnt/rules.mk (SFNT_DRV_SRC): Add `ttsvg.c`.
- * src/sfnt/sfdriver.c: Include `ttsvg.h`.
- (sfnt_interface): Add `tt_face_load_svg`, `tt_face_free_svg` and
- `tt_face_load_svg_doc`.
- * src/sfnt/sfnt.c: Include `ttsvg.c`.
- * src/sfnt/sfobjs.c (sfnt_load_face, sfnt_done_face): Add code to load and
- free data of the the SVG table.
- * src/sfnt/ttsvg.c: New file, implementing `tt_face_load_svg`,
- `tt_face_free_svg` and `tt_face_load_svg_doc`.
- * src/sfnt/ttsvg.h: Declarations of the SVG functions in
- `ttsvg.c`.
-
-2022-01-20 Moazin Khatti
-
- Add flag `FT_CONFIG_OPTION_SVG`.
-
- This flag is going to be used to conditionally compile support for OT-SVG
- glyphs. FreeType will do the parsing and rely on external hooks for
- rendering of OT-SVG glyphs.
-
- * devel/ftoption.h, include/freetype/config/ftoption.h
- (FT_CONFIG_OPTION_SVG): New flag.
-
-2022-01-20 Alexei Podtelezhnikov
-
- [pshinter] Avoid unnecessary zeroing.
-
- * src/pshinter/pshalgo.c (psh_hint_table_init,psh_glyph_init,
- psh_glyph_interpolate_normal_points): Use FT_QNEW_ARRAY.
-
-2022-01-20 Alexei Podtelezhnikov
-
- * include/freetype/freetype.h: Clarify `FT_Size` life cycle.
-
-2022-01-20 Alexei Podtelezhnikov
-
- [base] Undefined scale means no scale.
-
- It might be surprising that FreeType does not have default ppem and
- the size has to be set explicitly or face undefined behavior with
- undefined variables and errors. This offers an alternative to
- missing or zero scale by simply setting FT_LOAD_NO_SCALE. Defined
- behavior is bettr than undefined one.
-
- This is alternative to !132 and discussed in
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43708
-
- * src/base/ftobjs.c (FT_Load_Glyph): Deal with zero scale.
- * include/freetype/freetype.h: Document it.
-
-2022-01-18 Alexei Podtelezhnikov
-
- * src/autofit/afglobal.c (af_face_globals_new): Reduce zeroing.
-
- Everything in AF_FaceGlobals is initialized except metrics. Those
- are zeroed here and initialized on demand later.
-
-2022-01-16 Alexei Podtelezhnikov
-
- [bdf,type1] Avoid unnecessary hash zeroing.
-
- * src/bdf/bdflib.c (_bdf_parse_start): Use `FT_QALLOC`.
- * src/type1/t1load.c (parse_subrs): Use `FT_QNEW`.
-
-2022-01-16 Ozkan Sezer
-
- Add Watcom C/C++ calling.
-
- In the unlikely case the source is built with OpenWatcom's -ec?
- switches to enforce a calling convention, the qsort() compare
- function must still be set to __watcall.
-
- * include/freetype/internal/compiler-macros.h (FT_COMPARE_DEF):
- Updated.
-
-2022-01-15 Ben Wagner
-
- [pshinter] Avoid accessing uninitialized zone.
-
- The `normal_top.count` may be 0, implying no `normal_top.zones` exist.
- The code must not access these (non-existent) `normal_top.zones`.
-
- * src/pshinter/pshalgo.c (ps_hints_apply): Do not assume that
- `normal_top.zones[0]` is initialized. Test `normal_top.count`
- before using `normal_top.zones[0]`. Do not rescale if there are no
- `zones`.
-
- Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43675
-
-2022-01-15 Alexei Podtelezhnikov
-
- [cache] Avoid unnecessary zeroing.
-
- * src/cache/ftccmap.c (ftc_cmap_node_new): Use `FT_QNEW`.
- * src/cache/ftcimage.c (FTC_INode_New): Ditto.
- * src/cache/ftcsbits.c (FTC_SNode_New): Ditto.
-
-2022-01-15 Ozkan Sezer
-
- Add Watcom C/C++ support.
-
- * include/freetype/config/integer-types.h: Make sure `long long` is
- used then available.
- * include/freetype/internal/ftcalc.h (FT_MSB): Add Watcom C/C++ pragma.
-
-2022-01-15 Alexei Podtelezhnikov
-
- * src/sdf/ftbsdf.c (ED): s/near/prox/.
-
- This works around the Watcom C definition of `near` as restricted
- __near.
-
-2022-01-15 Alexei Podtelezhnikov
-
- * include/freetype/internal/compiler-macros.h [FT_COMPARE_DEF]: Tighten.
-
- This works around Watcom C library using __watcall.
-
-2022-01-14 Alexei Podtelezhnikov
-
- * src/pshinter/pshglob.c (psh_globals_new): Avoid zeroing.
-
- This large allocation is followed by careful initialization. Whatever
- is missed should be initialized manually.
-
-2022-01-14 Alexei Podtelezhnikov
-
- * src/base/fthash.c (hash_insert): Avoid unnecessary zeroing.
-
-2022-01-14 Alexei Podtelezhnikov
-
- * src/bdf/bdflib.c (_bdf_parse_glyphs): Remove redundant assignment.
-
-2022-01-13 Alexei Podtelezhnikov
-
- * src/lzw/ftlzw.c (FT_Stream_OpenLZW): Avoid unnecessary zeroing.
-
-2022-01-13 Ben Wagner
-
- [bzip2] Reset bzip stream on any error.
-
- According to the bzip documentation it is undefined what will happen if
- `BZ2_bzDecompress` is called on a `bz_stream` it has previously returned an
- error against. If `BZ2_bzDecompress` returns anything other than `BZ_OK`
- the only valid next action is `BZ2_bzDecompressEnd`.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43564
-
- * src/bzip2/ftbzip2.c (FT_BZip2FileRec_): Add `reset` to track the need to
- reset the stream.
- (ft_bzip2_file_init): Initialize `reset` to 0.
- (ft_bzip2_file_reset): Set `reset` to 0 after resetting.
- (ft_bzip2_file_fill_output): Set `reset` to 1 when `BZ2_bzDecompress`
- returns anything other than `BZ_OK`.
-
-2022-01-12 Werner Lemberg
-
- .gitlab-ci.yml: Minor comment cleanups.
-
-2022-01-12 Azamat H. Hackimov
-
- .gitlab-ci.yml: Add steps to `before_script` to ensure recent CA.
-
- Fetch current list of valid CAs from Windows Update and manually import them
- to trusted datastore. This action is required to make downloads work from
- sites that need recent Let's Encrypt ISRG Root X1 certificate.
-
-2022-01-11 Ben Wagner
-
- Revert "[bzip2] Avoid use of uninitialized memory."
-
- This reverts commit d276bcb7f0c02c20d3585b2e5626702df6d140a6.
-
- The original commit did avoid the use of uninitialized memory. However,
- it appears that the original commit is no longer required. The
- underlying issue was resolved by a change in freetype2-testing "Build
- bzip2 correctly." [0]. Prior to [0] bzip2 was built without msan, so
- bzip2 writes were not tracked or considered initialized. Clearing
- `buffer` in the original commit allowed msan to see the `buffer` content
- initialized once in FreeType code, but msan saw no writes into buffer
- from bzip2. With bzip2 now built with msan, the bzip2 writes are
- properly instrumented and msan sees the bzip2 writes into the buffer. As
- a result the original commit can be safely reverted to allow for better
- detection of other uninitialized data scenarios.
-
- * src/bzip2/ftbzip2.c (FT_Stream_OpenBzip2): Revert to using `FT_QNEW`.
-
- [0] https://github.com/freetype/freetype2-testing/commit/3c052a837a3c960709227a0d6ddd256e87b88853
-
-2022-01-11 Ben Wagner
-
- [type42] Track how much type42 ttf data is available.
-
- Currently `T42_Open_Face` eagerly allocates 12 bytes for the ttf header
- data which it expects `t42_parse_sfnts` to fill out from /sfnts data.
- However, there is no guarantee that `t42_parse_sfnts` will actually be
- called while parsing the type42 data as the /sfnts array may be missing
- or very short. This is also confusing behavior as it means
- `T42_Open_Face` is tightly coupled to the implementation of the very
- distant `t42_parse_sfnts` code which requires at least 12 bytes to
- already be reserved in `face->ttf_data`.
-
- `t42_parse_sfnts` itself eagerly updates `face->ttf_size` to track how
- much space is reserved for ttf data instead of traking how much data has
- actually been written into `face->ttf_data`. It will also act strangely
- in the presense of multiple /sfnts arrays.
-
- * src/type42/t42objs.c (T42_Open_Face): ensure `ttf_data` is initialized
- to NULL. Free `ttf_data` on error.
-
- * src/type42/t42parse.c (t42_parse_sfnts): delay setting `ttf_size` and
- set it to the actual number of bytes read. Ensure `ttf_data` is freed
- if there are multiple /sfnts arrays or there are any errors.
-
-2022-01-11 Dominik Röttsches
-
- [sfnt] Fix limit checks for `COLR` v1 ClipBoxes
-
- * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Fix off-by-one in
- limit checks.
-
-2022-01-11 Werner Lemberg
-
- Update all copyright notices.
-
-2022-01-11 Werner Lemberg
-
- * src/sfnt/ttcolr.c (read_paint): Fix undefined left-shift operation.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43151
-
-2022-01-11 Werner Lemberg
-
- * src/type42/t42objs.c (T42_Open_Face): Avoid use of uninitialized memory.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43508
-
-2022-01-11 Werner Lemberg
-
- .gitlab-ci.yml: Fix typo in previous commit.
-
-2022-01-11 Werner Lemberg
-
- .gitlab-ci.yml: Update Windows image.
-
- The old image produced errors like
-
- ```
- Downloading zlib patch from
- https://wrapdb.mesonbuild.com/v2/zlib_1.2.11-5/get_patch
- A fallback URL could be specified using patch_fallback_url key in the wrap file
- WrapDB connection failed to
- https://wrapdb.mesonbuild.com/v2/zlib_1.2.11-5/get_patch
- with error
-
- ```
-
-2022-01-11 Werner Lemberg
-
- * subprojects/zlib.wrap: Update from upstream.
-
-2022-01-10 Werner Lemberg
-
- * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Add limit checks.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=40716
-
-2022-01-10 Werner Lemberg
-
- [zlib] Don't typedef `ptrdiff_t`.
-
- While using zlib in 'solo' mode (via the `Z_SOLO` macro), we actually
- include some standard header files, making the typedef fail on systems where
- the native `ptrdiff_t` type differs.
-
- Fixes #1124.
-
- * src/zlib/zutil.h: Comment out definition; it doesn't work on Windows.
-
- * src/zlib/patches/freetype-zlib.diff: Updated.
-
-2022-01-10 Werner Lemberg
-
- [zlib] Some organizational changes.
-
- We now first apply zlib's `zlib2ansi` script, then FreeType's patch file.
-
- * src/gzip/README.freetype: Updated.
-
- * patches/0001-zlib-Fix-zlib-sources-to-compile-for-FreeType.patch: Renamed
- to...
- * patches/freetype-zlib.diff: This.
- Clean up description, then regenerate it as follows:
-
- - Copy unmodified files from `zlib` repository.
- - Run `zlib2ansi` script.
- - Run `git diff -R > patches/freetype-zlib.diff.new`.
- - Insert patch description of old diff file, then replace old diff with
- new diff file.
-
-2022-01-09 David Turner
-
- [gzip] Update sources to zlib 1.2.11
-
- This can be tested by building with the Unix development build
-
- make setup devel
- make
-
- or by building the freetype-demos programs with
-
- meson setup build -Dfreetype2:zlib=internal
- meson compile -C out
-
- and trying to run `ftview` with a `.pcf.gz` font file.
-
- * src/gzip/ftgzip.c, src/gzip/rules.mk: Update for new zlib sources. Also
- remove the temporary fix introduced in commit 6a431038 to work around the
- fact that the internal sources were too old.
-
- * src/gzip/README.freetype: New file describing the origin of the sources
- and how they were modified.
-
- * src/gzip/patches/*: Patch files applied to original sources.
-
- * src/gzip/*: Updated zlib sources with the patch file(s) from
- `src/gzip/patches/` applied, followed by a conversion with zlib's
- `zlib2ansi` script.
-
-2022-01-09 David Turner
-
- [meson] Change Zlib configuration option.
-
- * meson_options.txt, meson.build: Change the format of the 'zlib' meson
- build configuration option to be a combo with the following choices:
-
- - none: Do not support gzip-compressed streams at all.
-
- - internal: Support gzip-compressed streams using the copy of the gzip
- sources under `src/gzip/`; this should only be used during development
- to ensure these work properly.
-
- - external: Support gzip-compressed streams using the 'zlib' Meson
- subproject, linked as a static library.
-
- - system: Support gzip-compressed streams using a system-installed version
- of zlib.
-
- - auto: Support gzip-compressed streams using a system-installed version
- of zlib, if available, or using the 'zlib' subproject otherwise. This
- is the default.
-
- - disabled: Backward-compatible alias for 'none'.
-
- - enabled: Backward-compatible alias for 'auto'.
-
-2022-01-09 Werner Lemberg
-
- [bzip2] Avoid use of uninitialized memory.
-
- * src/bzip2/ftbzip2.c (FT_Stream_OpenBzip2): Don't use `FT_QNEW` but
- `FT_NEW` for setting up `zip` to avoid uninitialized memory access while
- handling malformed PCF fonts later on.
-
- Fixes
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=42800
-
-2022-01-09 Alexei Podtelezhnikov
-
- [sfnt] Fix off-by-one error.
-
- The 0-base index is equal to the number of previosly parsed entries.
- It is an error to adjust it by one to get the number truncated by
- a stream error. This is probably inconsequential because valid
- entries are correctly accounted for.
-
- * src/sfnt/ttload.c (check_table_dir): Do not adjust the truncated
- number of tables.
-
-2022-01-08 Werner Lemberg
-
- [sfnt, type42] Correct previous commit.
-
- Really fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=42773.
-
- * src/sfnt/ttload.c (check_table_dir): Revert change.
-
- * src/type42/t42.parse.c (t42_parse_sfnts): Don't use `FT_QREALLOC` but
- `FT_REALLOC` for setting up `ttf_data` to avoid uninitialized memory access
- while handling malformed TrueType fonts later on.
-
-2022-01-07 Werner Lemberg
-
- * src/sfnt/ttload.c (check_table_dir): Initialize `table`.
-
- Reported as
-
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=42773
-
-2022-01-07 Werner Lemberg
-
- [sfnt] Avoid 'runtime error: applying zero offset to null pointer'.
-
- * src/sfnt/ttsbit.c (tt_sbit_decoder_load_byte_aligned): Exit early if
- `line` is NULL.
-
-2022-01-07 Werner Lemberg
-
- [autofit, pshinter] Use `FT_OFFSET`.
-
- This avoids
-
- ```
- runtime error: applying zero offset to null pointer
- ```
-
- warnings of clang's undefined behaviour sanitizer.
-
- * src/autofit/afcjk.c (af_cjk_hints_link_segments,
- af_cjk_hints_compute_edges, af_cjk_hints_compute_blue_edges,
- af_cjk_hint_edges, af_cjk_align_edge_points): Do it.
-
- * src/autofit/afhints.c (af_glyph_hints_align_edge_points,
- af_glyph_hints_align_strong_points): Ditto.
-
- * src/autofit/aflatin.c (af_latin_metrics_init_widths,
- af_latin_hints_link_segments, af_latin_hints_compute_edges,
- af_latin_hints_compute_blue_edges, af_latin_hint_edges): Ditto.
-
- * src/pshinter/pshalgo.c (psh_hint_table_init): Ditto.
-
-2022-01-06 Ben Wagner
-
- [truetype] Reset localpoints when varying cvt.
-
- When iterating over the cvt tuples and reading in the points it is necessary
- to set all of `localpoints`, `points`, and `point_count` in all cases. The
- existing code did not reset `localpoints` to `NULL` when there were no
- private point numbers. If the previous tuple did have private point numbers
- and set `localpoints` to `ALL_POINTS` this would not be cleared and the
- wrong branch would be taken later, leading to possible heap buffer overflow.
-
- * src/truetype/ttgxvar.c (tt_face_vary_cvt): Reset `localpoints` to `NULL`
- when it isn't valid.
-
- Fixes: https://crbug.com/1284742
-
-2022-01-02 Werner Lemberg
-
- * builds/unix/configure.raw: Restore `SYSTEM_ZLIB` variable.
-
- This was accidentally removed with commit 93ebcbd0 almost eight years ago.
-
-2021-12-27 Alexander Borsuk
-
- Fix warnings for CMake Unity builds.
-
- * src/cache/ftcbasic.c (FT_COMPONENT): Undefine macro before redefinition.
- * src/smooth/ftgrays.c (TRUNC, FRACT): Ditto.
-
-2021-12-18 Alexander Borsuk
-
- Clang-Tidy warning fixes.
-
- * src/base/ftobjs.c (FT_Get_Paint): Operator has equivalent nested operands.
- * src/bdf/bdflib.c (_bdf_add_property): Value stored to `fp` is never read.
- * src/sdf/ftbsdf.c (bsdf_init_distance_map): Value stored to `pixel` is
- never read.
- * src/sdf/ftsdf.c (split_sdf_shape): Value stored to `error` is never read.
-
-2021-12-17 Eli Schwartz
-
- * meson.build: Optimize lookup for `python3` program.
-
- The python module's `find_installation` method is intended to provide
- routines for compiling and installing python modules into the
- `site-packages` directory. It does a couple of slow things, including run
- an introspection command to scrape sysconfig info from the detected
- interpreter, which are not needed for the sole use case of invoking the
- found installation as an executable.
-
- Furthermore, when invoked without the name or path of a python binary, it is
- hardcoded to always look for `python3` corresponding to the interpreter
- meson itself uses to run. So using `find_installation` did not even allow
- detecting `python2` as a fallback.
-
- Instead, switch to a simple `find_program` lookup that finishes as soon as
- the program is found.
-
-2021-12-17 Eli Schwartz
-
- * builds/meson/*.py: Fix name of python executable for auxiliary scripts.
-
- The previous change to check the return code of `run_command` invocations
- caused the CI to fail. Although most scripts used `python_exe` as the
- program command, the script to determine the project version did not.
-
- But, all scripts used `python` as the shebang, and this is not available on
- all systems. Particularly Debian does not provide a `python` command,
- though `python3` does exist. This meant that formerly the version number
- was lacking, and now the build simply fails.
-
- Instead, rely on `python3` since it is guaranteed to exist when running
- meson, and `python2` is end of life anyway.
-
-2021-12-17 Eli Schwartz
-
- * meson.build: Check the return value of `run_command`.
-
- By default, errors are not checked and a command that is somehow broken will
- just capture incorrect output (likely an empty string). Current development
- versions of meson now raise a warning for this implicit behavior, and advise
- explicitly setting the `check:` keyword argumend to determine whether a
- failing return code should be considered an error.
-
- Since none of the commands in this project are expected to fail, mark them
- as required to succeed.
-
-2021-12-13 Alexei Podtelezhnikov
-
- [truetype] Upstream the hdmx binary search.
-
- * src/truetype/ttobjs.h (TT_SizeRec): Add `widthp` for the hdmx
- widths.
- * src/truetype/ttobjs.c (tt_size_reset): Initialize `widthp` even
- though it might never be used by the interpreter.
- * src/truetype/ttgload.c (tt_loader_init): Avoid repeated searches
- in the hdmx table.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Reset the IUP-called flags for each subglyph.
-
- This fixes fall-out from 7809007a5b88b15, where the composite
- accents were no longer hinted.
-
- * src/truetype/ttgload.c (ttloader_init): Move the IUP-called flag
- initialization from here...
- * src/truetype/ttinterp.c (TT_Run_Context): ... to here.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Binary search through the `hdmx` records.
-
- The `hdmx` table is supposed to be sorted by ppem size, which
- enables binary search. We also drop the check for the sufficient
- length of the record because it is now enforced when the table
- is loaded.
-
- * include/freetype/internal/tttypes.h (TT_FaceRec): Store the `hdmx`
- record pointers sorted by ppem instead of ppem's themselves.
- * src/truetype/ttpload.c (tt_face_load_hdmx): Prudently sort records.
- (tt_face_get_device_metrics): Implement binary search to retrieve
- advances.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Honor FT_LOAD_ADVANCE_ONLY if `hdmx` is usable.
-
- This simply shortcuts the glyph loading if FT_LOAD_ADVANCE_ONLY
- is specified by FT_Get_Advances and the `hdmx` data are located.
- Particularly, the classic v35 interpreter or "verified" ClearType
- fonts might see 100x speed up in retrieving the hdmx cache.
-
- * src/truetype/ttgload.c (TT_Load_Glyph): Insert the shortcut.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Initialize the loader with `hdmx` data.
-
- The `hdmx` matching can be done before the glyph is loaded.
-
- * include/freetype/internal/tttypes.h (TT_LoaderRec): Add a field.
- * src/truetype/ttgload.c (compute_glyph_metrics): Relocate the `hdmx`
- code from here...
- (tt_loader_init): ... to here, before the glyph is loaded.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Relocate subpixel flag setting.
-
- `TT_RunIns` is too busy to deal with subpixel flags. It is better
- to set them in `tt_loader_init`, which is executed before each
- glyph program.
-
- * src/truetype/ttinterp.c (TT_RunIns): Move the flag setting from
- here...
- * src/truetype/ttgload.c (tt_loader_init): ... to here.
-
-2021-12-12 Alexei Podtelezhnikov
-
- [truetype] Limit INSTCTRL appication within specs.
-
- * src/truetype/ttinterp.c (Ins_INSTCTRL): Limit its global effects
- to the CVT program and local effects to the glyph program.
-
- This also fixes an Infinality buglet. The `ignore_x_mode` should be
- locally unset by the glyph program.
-
-2021-12-09 Ben Wagner
-
- [bdf] Fix use of uninitialized value.
-
- In _bdf_readstream if the data contained no newline then the buffer
- would continue to grow and uninitialized data read until either the
- uninitialized data contained a newline or the buffer reached its
- maxiumum size. The assumption was that the line was always too long and
- the buffer had been filled, however this case can also happen when there
- is not enough data to fill the buffer.
-
- Correct this by properly setting the cursor to the end of the available
- data, which may be different from the end of the buffer. This may still
- result in one extra allocation, but only on malformed fonts.
-
- * src/bdf/bdflib.c (_bfd_readstream): Correctly update cursor. Remove
- unread set of `avail`.
-
- Bug: https://lists.nongnu.org/archive/html/freetype-devel/2021-12/msg00001.html
-
-2021-12-07 Alexei Podtelezhnikov
-
- [truetype] Reduce Infinality footprint again.
-
- * src/truetype/ttgload.c (compute_glyph_metrics): Streamline and
- prioritize the Infinality checks to use `hdmx`.
-
-2021-12-07 Cameron Cawley
-
- [builds/windows] Guard some non-ancient API.
-
- We can support Windows 98 and NT 4.0 in principle...
-
- * builds/windows/ftdebug.c, builds/windows/ftsystem.c: Check for the
- ancient SDK using _WIN32_WINDOWS, _WIN32_WCE, or _WIN32_WINNT.
-
-2021-12-07 Cameron Cawley
-
- * builds/windows/visualc/freetype.vcproj: Add missing file.
-
2021-12-02 Werner Lemberg
* Version 2.11.1 released.
diff --git a/Build/source/libs/freetype2/freetype-src/Makefile b/Build/source/libs/freetype2/freetype-src/Makefile
index 8b293550711..f1284170904 100644
--- a/Build/source/libs/freetype2/freetype-src/Makefile
+++ b/Build/source/libs/freetype2/freetype-src/Makefile
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/README b/Build/source/libs/freetype2/freetype-src/README
index a33cb11aab1..6a320df90fa 100644
--- a/Build/source/libs/freetype2/freetype-src/README
+++ b/Build/source/libs/freetype2/freetype-src/README
@@ -1,4 +1,4 @@
-FreeType 2.12.0
+FreeType 2.11.1
===============
Homepage: https://www.freetype.org
@@ -30,9 +30,9 @@ sites. Go to
and download one of the following files.
- freetype-doc-2.12.0.tar.xz
- freetype-doc-2.12.0.tar.gz
- ftdoc2120.zip
+ freetype-doc-2.11.1.tar.xz
+ freetype-doc-2.11.1.tar.gz
+ ftdoc2111.zip
To view the documentation online, go to
@@ -92,7 +92,7 @@ Enjoy!
----------------------------------------------------------------------
-Copyright (C) 2006-2022 by
+Copyright (C) 2006-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/README.git b/Build/source/libs/freetype2/freetype-src/README.git
index 258de14b724..ad3c74cad9c 100644
--- a/Build/source/libs/freetype2/freetype-src/README.git
+++ b/Build/source/libs/freetype2/freetype-src/README.git
@@ -89,7 +89,7 @@ address:
----------------------------------------------------------------------
-Copyright (C) 2005-2022 by
+Copyright (C) 2005-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/autogen.sh b/Build/source/libs/freetype2/freetype-src/autogen.sh
index 1545c63ad5c..8cca7c84a71 100755
--- a/Build/source/libs/freetype2/freetype-src/autogen.sh
+++ b/Build/source/libs/freetype2/freetype-src/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/README b/Build/source/libs/freetype2/freetype-src/builds/amiga/README
index e77435527a0..4ec8770ba5d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/README
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/README
@@ -1,7 +1,7 @@
README for the builds/amiga subdirectory.
-Copyright (C) 2005-2022 by
+Copyright (C) 2005-2021 by
Werner Lemberg and Detlef Würkner.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftconfig.h b/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftconfig.h
index 211f170e925..6deea6b7e1b 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftconfig.h
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific configuration file (specification only). */
/* */
-/* Copyright (C) 2005-2022 by */
+/* Copyright (C) 2005-2021 by */
/* Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftmodule.h b/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftmodule.h
index 73e86d5b624..873537cab63 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftmodule.h
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/include/config/ftmodule.h
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific FreeType module selection. */
/* */
-/* Copyright (C) 2005-2022 by */
+/* Copyright (C) 2005-2021 by */
/* Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile b/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile
index 5df281c0b0f..ed7c780b398 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile
@@ -5,7 +5,7 @@
#
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile.os4 b/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile.os4
index 02742ea4644..58c89208b6c 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile.os4
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/makefile.os4
@@ -4,7 +4,7 @@
#
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/smakefile b/Build/source/libs/freetype2/freetype-src/builds/amiga/smakefile
index 311375d0ea4..aaddd1995fe 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/smakefile
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/smakefile
@@ -3,7 +3,7 @@
#
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftdebug.c b/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftdebug.c
index 84e2c8bac7b..dc7e968db9e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftdebug.c
@@ -4,7 +4,7 @@
*
* Debugging and logging component for amiga (body).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
*
* This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftsystem.c
index ed34a779ff2..5c69e3ac9fc 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/amiga/src/base/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific FreeType low-level system interface (body). */
/* */
-/* Copyright (C) 1996-2022 by */
+/* Copyright (C) 1996-2021 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi-def.mk b/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi-def.mk
index d91894c0691..218d5c0d151 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi-def.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi-def.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi.mk b/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi.mk
index 96c1576d041..b36c64e2f9e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/ansi/ansi.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/beos/beos-def.mk b/Build/source/libs/freetype2/freetype-src/builds/beos/beos-def.mk
index 0b3ef60991b..d7d63b37c67 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/beos/beos-def.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/beos/beos-def.mk
@@ -5,7 +5,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/beos/beos.mk b/Build/source/libs/freetype2/freetype-src/builds/beos/beos.mk
index a5e6a82c001..f3e3fbbe917 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/beos/beos.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/beos/beos.mk
@@ -2,7 +2,7 @@
# FreeType 2 configuration rules for a BeOS system
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/beos/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/beos/detect.mk
index 7b27ff9f931..521ecae98f1 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/beos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/beos/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/cmake/FindBrotliDec.cmake b/Build/source/libs/freetype2/freetype-src/builds/cmake/FindBrotliDec.cmake
index 0a3d8992689..46356b1fd43 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/cmake/FindBrotliDec.cmake
+++ b/Build/source/libs/freetype2/freetype-src/builds/cmake/FindBrotliDec.cmake
@@ -1,6 +1,6 @@
# FindBrotliDec.cmake
#
-# Copyright (C) 2019-2022 by
+# Copyright (C) 2019-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written by Werner Lemberg
diff --git a/Build/source/libs/freetype2/freetype-src/builds/cmake/iOS.cmake b/Build/source/libs/freetype2/freetype-src/builds/cmake/iOS.cmake
index 011e7ef0251..258654d4cb5 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/cmake/iOS.cmake
+++ b/Build/source/libs/freetype2/freetype-src/builds/cmake/iOS.cmake
@@ -1,6 +1,6 @@
# iOS.cmake
#
-# Copyright (C) 2014-2022 by
+# Copyright (C) 2014-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written by David Wimsey
diff --git a/Build/source/libs/freetype2/freetype-src/builds/cmake/testbuild.sh b/Build/source/libs/freetype2/freetype-src/builds/cmake/testbuild.sh
index 312b47697a2..c6c637206a0 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/cmake/testbuild.sh
+++ b/Build/source/libs/freetype2/freetype-src/builds/cmake/testbuild.sh
@@ -1,6 +1,6 @@
#!/bin/sh -e
-# Copyright (C) 2015-2022 by
+# Copyright (C) 2015-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/ansi-cc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/ansi-cc.mk
index 98cb05776ee..e73e6fca307 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/ansi-cc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/ansi-cc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc-dev.mk
index 83ed28cf190..71804529b3e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc-dev.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc.mk
index 76b5dc2124f..321db108972 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/bcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/emx.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/emx.mk
index f7918362334..b3b6047e5e5 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/emx.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/emx.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc-dev.mk
index 0d1b0da7117..f01192f7ed8 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc-dev.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc.mk
index fbb12cc5bf9..ede20b2fc60 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/gcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/intelc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/intelc.mk
index b1fdbe729d5..e5dcf90b3ff 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/intelc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/intelc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/unix-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/unix-lcc.mk
index 09da86f4fbd..40322b4be3e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/unix-lcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/visualage.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/visualage.mk
index 8c14d6f0416..ebc3e48cf82 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/visualage.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/visualage.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/visualc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/visualc.mk
index 2635a9fec58..dc6998ad1db 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/visualc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/visualc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/watcom.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/watcom.mk
index 6484d4180ab..c1d1b66519e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/watcom.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/watcom.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/compiler/win-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/compiler/win-lcc.mk
index 1faad494002..27fbc303430 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/compiler/win-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/compiler/win-lcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/detect.mk
index 4068ca2a65d..78e9e750ec4 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/dos/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/dos/detect.mk
index 46f9a630c41..d95a2caa528 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/dos/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/dos/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-def.mk b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-def.mk
index 307047da5b4..f7fbc4d6563 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-def.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-def.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-emx.mk b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-emx.mk
index 4ab7b6c7ede..dd9947962c7 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-emx.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-emx.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-gcc.mk b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-gcc.mk
index 24d14a9b275..9abdabea128 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-gcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-wat.mk b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-wat.mk
index 07d54e89674..7ab82afeb0d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/dos/dos-wat.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/dos/dos-wat.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/exports.mk b/Build/source/libs/freetype2/freetype-src/builds/exports.mk
index a3342ecb987..67c7c993569 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/exports.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/exports.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/freetype.mk b/Build/source/libs/freetype2/freetype-src/builds/freetype.mk
index 7b30c79d610..bae8145564a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/freetype.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/freetype.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/link_dos.mk b/Build/source/libs/freetype2/freetype-src/builds/link_dos.mk
index dd97fbe7c07..8716be51be4 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/link_dos.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/link_dos.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/link_std.mk b/Build/source/libs/freetype2/freetype-src/builds/link_std.mk
index d94e06d01cb..03f77721ffb 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/link_std.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/link_std.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist b/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist
index 344e5ac0b3a..4b5d79b815e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist
+++ b/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist
@@ -9,7 +9,7 @@
English
CFBundleExecutable
- freetype
+ FreeType
CFBundleGetInfoString
FreeType ${PROJECT_VERSION}
diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c b/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c
index f30ffc7d17a..cd3f4844b4d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c
@@ -5,7 +5,7 @@
/* Mac FOND support. Written by just@letterror.com. */
/* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */
/* */
-/* Copyright (C) 1996-2022 by */
+/* Copyright (C) 1996-2021 by */
/* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -97,7 +97,7 @@
#define FT_DEPRECATED_ATTRIBUTE
-#include
+#include FT_MAC_H
/* undefine blocking-macros in ftmac.h */
#undef FT_GetFile_From_Mac_Name
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/extract_freetype_version.py b/Build/source/libs/freetype2/freetype-src/builds/meson/extract_freetype_version.py
index 66b5bc85581..ab79fdb3b44 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/extract_freetype_version.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/extract_freetype_version.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/extract_libtool_version.py b/Build/source/libs/freetype2/freetype-src/builds/meson/extract_libtool_version.py
index 580f645c1cc..4527f11b216 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/extract_libtool_version.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/extract_libtool_version.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/generate_reference_docs.py b/Build/source/libs/freetype2/freetype-src/builds/meson/generate_reference_docs.py
index eb448063366..15d9b066005 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/generate_reference_docs.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/generate_reference_docs.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py b/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
index f68110cf0c3..aa6e9e1763a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -87,7 +87,6 @@ def generate_ftmodule(lists):
name = {
"raster": "ft_raster1",
"smooth": "ft_smooth",
- "svg": "ft_svg",
}.get(module)
result += (
"FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/process_ftoption_h.py b/Build/source/libs/freetype2/freetype-src/builds/meson/process_ftoption_h.py
index d3f8bb9ae40..fe608878587 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/process_ftoption_h.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/process_ftoption_h.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/modules.mk b/Build/source/libs/freetype2/freetype-src/builds/modules.mk
index abbb0ef9e85..33fccdf96e1 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/modules.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/modules.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/os2/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/os2/detect.mk
index 0bb557680be..7b8962b1979 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/os2/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/os2/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-def.mk b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-def.mk
index 4f508bb365a..08aab9573c5 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-def.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-def.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-dev.mk
index 7c35c1c46cf..40591ffe380 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-dev.mk
@@ -5,7 +5,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-gcc.mk b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-gcc.mk
index 62003f82c44..854c46df852 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/os2/os2-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/os2/os2-gcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/symbian/bld.inf b/Build/source/libs/freetype2/freetype-src/builds/symbian/bld.inf
index 6d20af917e7..b9d000b1a22 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/symbian/bld.inf
+++ b/Build/source/libs/freetype2/freetype-src/builds/symbian/bld.inf
@@ -2,7 +2,7 @@
// FreeType 2 project for the symbian platform
//
-// Copyright (C) 2008-2022 by
+// Copyright (C) 2008-2021 by
// David Turner, Robert Wilhelm, and Werner Lemberg.
//
// This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/symbian/freetype.mmp b/Build/source/libs/freetype2/freetype-src/builds/symbian/freetype.mmp
index ef3a96f1508..fa49157abf2 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/symbian/freetype.mmp
+++ b/Build/source/libs/freetype2/freetype-src/builds/symbian/freetype.mmp
@@ -2,7 +2,7 @@
// FreeType 2 makefile for the symbian platform
//
-// Copyright (C) 2008-2022 by
+// Copyright (C) 2008-2021 by
// David Turner, Robert Wilhelm, and Werner Lemberg.
//
// This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/toplevel.mk b/Build/source/libs/freetype2/freetype-src/builds/toplevel.mk
index fb0838e9809..53b6d6fc13f 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/toplevel.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/toplevel.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -304,12 +304,13 @@ do-dist: distclean refdoc
cp $(CONFIG_GUESS) builds/unix
cp $(CONFIG_SUB) builds/unix
- @# Generate `ChangeLog' file with commits since release 2.11.0
- @# (when we stopped creating this file manually).
+ @# Generate `ChangeLog' file with commits since previous release.
$(CHANGELOG_SCRIPT) \
--format='%B%n' \
--no-cluster \
- -- VER-2-11-0..$(version_tag) \
+ -- `git describe --tags \
+ --abbrev=0 \
+ $(version_tag)^`..$(version_tag) \
> ChangeLog
@# Remove intermediate files created by the `refdoc' target.
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
index dba16e84c77..9b62e37c43c 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2022 Free Software Foundation, Inc.
+# Copyright 1992-2021 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-01-03'
+timestamp='2021-12-25'
# 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
@@ -76,7 +76,7 @@ Report bugs and patches to ."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2021 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
index 28bad74ab73..bf1b1cb23b7 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.71 for FreeType 2.12.
+# Generated by GNU Autoconf 2.71 for FreeType 2.11.1.
#
# Report bugs to .
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.12'
-PACKAGE_STRING='FreeType 2.12'
+PACKAGE_VERSION='2.11.1'
+PACKAGE_STRING='FreeType 2.11.1'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -666,10 +666,8 @@ build_libtool_libs
wl
hardcode_libdir_flag_spec
LIBSSTATIC_CONFIG
-PKGCONFIG_LIBS_PRIVATE
-PKGCONFIG_REQUIRES_PRIVATE
-PKGCONFIG_LIBS
-PKGCONFIG_REQUIRES
+LIBS_PRIVATE
+REQUIRES_PRIVATE
ftmac_c
PYTHON_VERSION
PYTHON
@@ -682,10 +680,7 @@ target_os
target_vendor
target_cpu
target
-FT_DEMO_LDFLAGS
-FT_DEMO_CFLAGS
-LIBRSVG_LIBS
-LIBRSVG_CFLAGS
+LIB_CLOCK_GETTIME
BROTLI_LIBS
BROTLI_CFLAGS
HARFBUZZ_LIBS
@@ -694,7 +689,6 @@ LIBPNG_LIBS
LIBPNG_CFLAGS
BZIP2_LIBS
BZIP2_CFLAGS
-SYSTEM_ZLIB
ZLIB_LIBS
ZLIB_CFLAGS
XX_ANSIFLAGS
@@ -841,9 +835,7 @@ LIBPNG_LIBS
HARFBUZZ_CFLAGS
HARFBUZZ_LIBS
BROTLI_CFLAGS
-BROTLI_LIBS
-LIBRSVG_CFLAGS
-LIBRSVG_LIBS'
+BROTLI_LIBS'
# Initialize some variables set by options.
@@ -1392,7 +1384,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.12 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1459,7 +1451,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.12:";;
+ short | recursive ) echo "Configuration of FreeType 2.11.1:";;
esac
cat <<\_ACEOF
@@ -1545,10 +1537,6 @@ Some influential environment variables:
BROTLI_CFLAGS
C compiler flags for BROTLI, overriding pkg-config
BROTLI_LIBS linker flags for BROTLI, overriding pkg-config
- LIBRSVG_CFLAGS
- C compiler flags for LIBRSVG, overriding pkg-config
- LIBRSVG_LIBS
- linker flags for LIBRSVG, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1617,7 +1605,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.12
+FreeType configure 2.11.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1968,7 +1956,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.12, which was
+It was created by FreeType $as_me 2.11.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2730,7 +2718,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='24:2:18'
+version_info='24:1:18'
ft_version=`echo $version_info | tr : .`
@@ -13949,12 +13937,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
as_fn_error $? "external zlib support requested but library not found" "$LINENO" 5
fi
-SYSTEM_ZLIB=
-if test "$have_zlib" != no; then
- SYSTEM_ZLIB=yes
-fi
-
-
# check for system libbz2
@@ -14514,16 +14496,13 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
fi
-# Checks for the demo programs.
+# check for librt
#
-# FreeType doesn't need this. However, since the demo program repository
-# doesn't come with a `configure` script of its own, we integrate the tests
-# here for simplicity.
-
-# We need `clock_gettime` from 'librt' for the `ftbench` demo program.
+# We need `clock_gettime' for the `ftbench' demo program.
#
-# The code is modeled after gnulib's file `clock_time.m4`, ignoring
+# The code is modeled after gnulib's file `clock_time.m4', ignoring
# very old Solaris systems.
+
LIB_CLOCK_GETTIME=
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
printf %s "checking for library containing clock_gettime... " >&6; }
@@ -14586,89 +14565,6 @@ then :
fi
-# 'librsvg' is needed to demonstrate SVG support.
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBRSVG" >&5
-printf %s "checking for LIBRSVG... " >&6; }
-
-if test -n "$LIBRSVG_CFLAGS"; then
- pkg_cv_LIBRSVG_CFLAGS="$LIBRSVG_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.46.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.46.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.46.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBRSVG_LIBS"; then
- pkg_cv_LIBRSVG_LIBS="$LIBRSVG_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.46.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.46.0") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.46.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.46.0" 2>&1`
- else
- LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.46.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBRSVG_PKG_ERRORS" >&5
-
- have_librsvg=no
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- have_librsvg=no
-else
- LIBRSVG_CFLAGS=$pkg_cv_LIBRSVG_CFLAGS
- LIBRSVG_LIBS=$pkg_cv_LIBRSVG_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- have_librsvg="yes (pkg-config)"
-fi
-
-FT_DEMO_CFLAGS=""
-FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
-fi
-
-
-
# Some options handling SDKs/archs in CFLAGS should be copied
@@ -16212,32 +16108,32 @@ fi
# entries in Requires.private are separated by commas
-PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \
- $bzip2_reqpriv, \
- $libpng_reqpriv, \
- $harfbuzz_reqpriv, \
- $brotli_reqpriv"
+REQUIRES_PRIVATE="$zlib_reqpriv, \
+ $bzip2_reqpriv, \
+ $libpng_reqpriv, \
+ $harfbuzz_reqpriv, \
+ $brotli_reqpriv"
# beautify
-PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/, */,/g' \
- -e 's/,,*/,/g' \
- -e 's/^,*//' \
- -e 's/,*$//' \
- -e 's/,/, /g'`
-
-PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \
- $bzip2_libspriv \
- $libpng_libspriv \
- $harfbuzz_libspriv \
- $brotli_libspriv \
- $ft2_extra_libs"
+REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/, */,/g' \
+ -e 's/,,*/,/g' \
+ -e 's/^,*//' \
+ -e 's/,*$//' \
+ -e 's/,/, /g'`
+
+LIBS_PRIVATE="$zlib_libspriv \
+ $bzip2_libspriv \
+ $libpng_libspriv \
+ $harfbuzz_libspriv \
+ $brotli_libspriv \
+ $ft2_extra_libs"
# beautify
-PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/ */ /g'`
+LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/ */ /g'`
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
@@ -16255,24 +16151,6 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
-e 's/ *$//' \
-e 's/ */ /g'`
-# If FreeType gets installed with `--disable-shared', don't use
-# 'private' fields. `pkg-config' only looks into `.pc' files and is
-# completely agnostic to whether shared libraries are actually present
-# or not. As a consequence, the user had to specify `--static' while
-# calling `pkg-config', which configure scripts are normally not
-# prepared for.
-
-PKGCONFIG_REQUIRES=
-PKGCONFIG_LIBS='-L${libdir} -lfreetype'
-
-if test $enable_shared = "no"; then
- PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE"
- PKGCONFIG_REQUIRES_PRIVATE=
- PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE"
- PKGCONFIG_LIBS_PRIVATE=
-fi
-
-
@@ -16861,7 +16739,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.12, which was
+This file was extended by FreeType $as_me 2.11.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16929,7 +16807,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-FreeType config.status 2.12
+FreeType config.status 2.11.1
configured by $0, generated by GNU Autoconf 2.71,
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 28f65b9a482..d1b7f1a78c5 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
@@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
-# Copyright (C) 2001-2022 by
+# Copyright (C) 2001-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.12], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.11.1], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='24:2:18'
+version_info='24:1:18'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@@ -317,12 +317,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
AC_MSG_ERROR([external zlib support requested but library not found])
fi
-SYSTEM_ZLIB=
-if test "$have_zlib" != no; then
- SYSTEM_ZLIB=yes
-fi
-AC_SUBST([SYSTEM_ZLIB])
-
# check for system libbz2
@@ -514,36 +508,19 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
fi
-# Checks for the demo programs.
+# check for librt
#
-# FreeType doesn't need this. However, since the demo program repository
-# doesn't come with a `configure` script of its own, we integrate the tests
-# here for simplicity.
-
-# We need `clock_gettime` from 'librt' for the `ftbench` demo program.
+# We need `clock_gettime' for the `ftbench' demo program.
#
-# The code is modeled after gnulib's file `clock_time.m4`, ignoring
+# The code is modeled after gnulib's file `clock_time.m4', ignoring
# very old Solaris systems.
+
LIB_CLOCK_GETTIME=
AC_SEARCH_LIBS([clock_gettime],
[rt],
[test "$ac_cv_search_clock_gettime" = "none required" \
|| LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-
-# 'librsvg' is needed to demonstrate SVG support.
-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
-
-FT_DEMO_CFLAGS=""
-FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
-fi
-
-AC_SUBST([FT_DEMO_CFLAGS])
-AC_SUBST([FT_DEMO_LDFLAGS])
+AC_SUBST([LIB_CLOCK_GETTIME])
# Some options handling SDKs/archs in CFLAGS should be copied
@@ -985,32 +962,32 @@ fi
# entries in Requires.private are separated by commas
-PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \
- $bzip2_reqpriv, \
- $libpng_reqpriv, \
- $harfbuzz_reqpriv, \
- $brotli_reqpriv"
+REQUIRES_PRIVATE="$zlib_reqpriv, \
+ $bzip2_reqpriv, \
+ $libpng_reqpriv, \
+ $harfbuzz_reqpriv, \
+ $brotli_reqpriv"
# beautify
-PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/, */,/g' \
- -e 's/,,*/,/g' \
- -e 's/^,*//' \
- -e 's/,*$//' \
- -e 's/,/, /g'`
-
-PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \
- $bzip2_libspriv \
- $libpng_libspriv \
- $harfbuzz_libspriv \
- $brotli_libspriv \
- $ft2_extra_libs"
+REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/, */,/g' \
+ -e 's/,,*/,/g' \
+ -e 's/^,*//' \
+ -e 's/,*$//' \
+ -e 's/,/, /g'`
+
+LIBS_PRIVATE="$zlib_libspriv \
+ $bzip2_libspriv \
+ $libpng_libspriv \
+ $harfbuzz_libspriv \
+ $brotli_libspriv \
+ $ft2_extra_libs"
# beautify
-PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/ */ /g'`
+LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/ */ /g'`
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
@@ -1028,28 +1005,10 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
-e 's/ *$//' \
-e 's/ */ /g'`
-# If FreeType gets installed with `--disable-shared', don't use
-# 'private' fields. `pkg-config' only looks into `.pc' files and is
-# completely agnostic to whether shared libraries are actually present
-# or not. As a consequence, the user had to specify `--static' while
-# calling `pkg-config', which configure scripts are normally not
-# prepared for.
-
-PKGCONFIG_REQUIRES=
-PKGCONFIG_LIBS='-L${libdir} -lfreetype'
-
-if test $enable_shared = "no"; then
- PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE"
- PKGCONFIG_REQUIRES_PRIVATE=
- PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE"
- PKGCONFIG_LIBS_PRIVATE=
-fi
AC_SUBST([ftmac_c])
-AC_SUBST([PKGCONFIG_REQUIRES])
-AC_SUBST([PKGCONFIG_LIBS])
-AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE])
-AC_SUBST([PKGCONFIG_LIBS_PRIVATE])
+AC_SUBST([REQUIRES_PRIVATE])
+AC_SUBST([LIBS_PRIVATE])
AC_SUBST([LIBSSTATIC_CONFIG])
AC_SUBST([hardcode_libdir_flag_spec])
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 cfb073efab9..f326872cbd7 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
@@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
-# Copyright (C) 2001-2022 by
+# Copyright (C) 2001-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='24:2:18'
+version_info='24:1:18'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@@ -317,12 +317,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
AC_MSG_ERROR([external zlib support requested but library not found])
fi
-SYSTEM_ZLIB=
-if test "$have_zlib" != no; then
- SYSTEM_ZLIB=yes
-fi
-AC_SUBST([SYSTEM_ZLIB])
-
# check for system libbz2
@@ -514,36 +508,19 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
fi
-# Checks for the demo programs.
+# check for librt
#
-# FreeType doesn't need this. However, since the demo program repository
-# doesn't come with a `configure` script of its own, we integrate the tests
-# here for simplicity.
-
-# We need `clock_gettime` from 'librt' for the `ftbench` demo program.
+# We need `clock_gettime' for the `ftbench' demo program.
#
-# The code is modeled after gnulib's file `clock_time.m4`, ignoring
+# The code is modeled after gnulib's file `clock_time.m4', ignoring
# very old Solaris systems.
+
LIB_CLOCK_GETTIME=
AC_SEARCH_LIBS([clock_gettime],
[rt],
[test "$ac_cv_search_clock_gettime" = "none required" \
|| LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-
-# 'librsvg' is needed to demonstrate SVG support.
-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
-
-FT_DEMO_CFLAGS=""
-FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-if test "$have_librsvg" != no; then
- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
-fi
-
-AC_SUBST([FT_DEMO_CFLAGS])
-AC_SUBST([FT_DEMO_LDFLAGS])
+AC_SUBST([LIB_CLOCK_GETTIME])
# Some options handling SDKs/archs in CFLAGS should be copied
@@ -985,32 +962,32 @@ fi
# entries in Requires.private are separated by commas
-PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \
- $bzip2_reqpriv, \
- $libpng_reqpriv, \
- $harfbuzz_reqpriv, \
- $brotli_reqpriv"
+REQUIRES_PRIVATE="$zlib_reqpriv, \
+ $bzip2_reqpriv, \
+ $libpng_reqpriv, \
+ $harfbuzz_reqpriv, \
+ $brotli_reqpriv"
# beautify
-PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/, */,/g' \
- -e 's/,,*/,/g' \
- -e 's/^,*//' \
- -e 's/,*$//' \
- -e 's/,/, /g'`
-
-PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \
- $bzip2_libspriv \
- $libpng_libspriv \
- $harfbuzz_libspriv \
- $brotli_libspriv \
- $ft2_extra_libs"
+REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/, */,/g' \
+ -e 's/,,*/,/g' \
+ -e 's/^,*//' \
+ -e 's/,*$//' \
+ -e 's/,/, /g'`
+
+LIBS_PRIVATE="$zlib_libspriv \
+ $bzip2_libspriv \
+ $libpng_libspriv \
+ $harfbuzz_libspriv \
+ $brotli_libspriv \
+ $ft2_extra_libs"
# beautify
-PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \
- | sed -e 's/^ *//' \
- -e 's/ *$//' \
- -e 's/ */ /g'`
+LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
+ | sed -e 's/^ *//' \
+ -e 's/ *$//' \
+ -e 's/ */ /g'`
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
@@ -1028,28 +1005,10 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
-e 's/ *$//' \
-e 's/ */ /g'`
-# If FreeType gets installed with `--disable-shared', don't use
-# 'private' fields. `pkg-config' only looks into `.pc' files and is
-# completely agnostic to whether shared libraries are actually present
-# or not. As a consequence, the user had to specify `--static' while
-# calling `pkg-config', which configure scripts are normally not
-# prepared for.
-
-PKGCONFIG_REQUIRES=
-PKGCONFIG_LIBS='-L${libdir} -lfreetype'
-
-if test $enable_shared = "no"; then
- PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE"
- PKGCONFIG_REQUIRES_PRIVATE=
- PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE"
- PKGCONFIG_LIBS_PRIVATE=
-fi
AC_SUBST([ftmac_c])
-AC_SUBST([PKGCONFIG_REQUIRES])
-AC_SUBST([PKGCONFIG_LIBS])
-AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE])
-AC_SUBST([PKGCONFIG_LIBS_PRIVATE])
+AC_SUBST([REQUIRES_PRIVATE])
+AC_SUBST([LIBS_PRIVATE])
AC_SUBST([LIBSSTATIC_CONFIG])
AC_SUBST([hardcode_libdir_flag_spec])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
index 7ed58ff745c..862b43219c8 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
index c076bc1f822..4edb092d09c 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (C) 2000-2022 by
+# Copyright (C) 2000-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in
index fe389f4b6fe..2d759ecf8bf 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in
@@ -7,8 +7,8 @@ Name: FreeType 2
URL: https://freetype.org
Description: A free, high-quality, and portable font engine.
Version: %ft_version%
-Requires: %PKGCONFIG_REQUIRES%
-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
-Libs: %PKGCONFIG_LIBS%
-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
+Requires:
+Requires.private: %REQUIRES_PRIVATE%
+Libs: -L${libdir} -lfreetype
+Libs.private: %LIBS_PRIVATE%
Cflags: -I${includedir}/freetype2
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
index 0cafc8e8cd2..478a422105f 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
@@ -1,7 +1,7 @@
# Configure paths for FreeType2
# Marcelo Magallon 2001-10-26, based on `gtk.m4` by Owen Taylor
#
-# Copyright (C) 2001-2022 by
+# Copyright (C) 2001-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
index c536febb232..275481ba113 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
@@ -1,6 +1,6 @@
## FreeType specific autoconf tests
#
-# Copyright (C) 2002-2022 by
+# Copyright (C) 2002-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in
index 67474dcef1a..b42fe42f9bf 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in
@@ -4,7 +4,7 @@
*
* UNIX-specific configuration file (specification only).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
index 4d2870b596f..81ed928584b 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
@@ -4,7 +4,7 @@
*
* Unix-specific FreeType low-level system interface (body).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
index 0758d6e1a5e..45b761d5358 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
index d5ae4674525..89be450167a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
@@ -2,7 +2,7 @@
# FreeType 2 template for Unix-specific compiler definitions
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -106,7 +106,9 @@ endif
# Linker flags.
#
-LDFLAGS := @LDFLAGS@
+LDFLAGS := @LDFLAGS@
+LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@ # for ftbench
+
# export symbols
#
@@ -116,15 +118,11 @@ EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
CCexe := $(CCraw_build) # used to compile `apinames' only
-# Library linking.
+# Library linking
#
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-rpath $(libdir) -version-info $(version_info) \
$(LDFLAGS) -no-undefined \
-export-symbols $(EXPORTS_LIST)
-# For the demo programs.
-FT_DEMO_CFLAGS := @FT_DEMO_CFLAGS@
-FT_DEMO_LDFLAGS := @FT_DEMO_LDFLAGS@
-
# EOF
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
index 8e298ac5910..d0c758d03fb 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -68,14 +68,12 @@ version_info := @version_info@
# Variables needed for `freetype-config' and `freetype.pc'.
#
-PKG_CONFIG := @PKG_CONFIG@
-PKGCONFIG_REQUIRES := @PKGCONFIG_REQUIRES@
-PKGCONFIG_REQUIRES_PRIVATE := @PKGCONFIG_REQUIRES_PRIVATE@
-PKGCONFIG_LIBS := @PKGCONFIG_LIBS@
-PKGCONFIG_LIBS_PRIVATE := @PKGCONFIG_LIBS_PRIVATE@
-LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@
-build_libtool_libs := @build_libtool_libs@
-ft_version := @ft_version@
+PKG_CONFIG := @PKG_CONFIG@
+REQUIRES_PRIVATE := @REQUIRES_PRIVATE@
+LIBS_PRIVATE := @LIBS_PRIVATE@
+LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@
+build_libtool_libs := @build_libtool_libs@
+ft_version := @ft_version@
# The directory where all library files are placed.
#
@@ -139,17 +137,15 @@ prefix_x := $(subst $(space),\\$(space),$(prefix))
$(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
rm -f $@ $@.tmp
- sed -e 's|%PKGCONFIG_REQUIRES%|$(PKGCONFIG_REQUIRES)|' \
- -e 's|%PKGCONFIG_REQUIRES_PRIVATE%|$(PKGCONFIG_REQUIRES_PRIVATE)|' \
- -e 's|%PKGCONFIG_LIBS%|$(PKGCONFIG_LIBS)|' \
- -e 's|%PKGCONFIG_LIBS_PRIVATE%|$(PKGCONFIG_LIBS_PRIVATE)|' \
- -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
- -e 's|%exec_prefix%|$(exec_prefix_x)|' \
- -e 's|%ft_version%|$(ft_version)|' \
- -e 's|%includedir%|$(includedir_x)|' \
- -e 's|%libdir%|$(libdir_x)|' \
- -e 's|%prefix%|$(prefix_x)|' \
- $< \
+ sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|' \
+ -e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|' \
+ -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
+ -e 's|%exec_prefix%|$(exec_prefix_x)|' \
+ -e 's|%ft_version%|$(ft_version)|' \
+ -e 's|%includedir%|$(includedir_x)|' \
+ -e 's|%libdir%|$(libdir_x)|' \
+ -e 's|%prefix%|$(prefix_x)|' \
+ $< \
> $@.tmp
chmod a-w $@.tmp
mv $@.tmp $@
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
index 37543895b2a..0b572a034bb 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
@@ -6,7 +6,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
index 0198adfd87a..db57835a0c1 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
@@ -6,7 +6,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
index e660fafa9d3..262fafb7486 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
index 923773e0919..77c2a0df5c8 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
@@ -4,7 +4,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/ftconfig.h b/Build/source/libs/freetype2/freetype-src/builds/vms/ftconfig.h
index 8f5ca967139..2445b7d792e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/vms/ftconfig.h
+++ b/Build/source/libs/freetype2/freetype-src/builds/vms/ftconfig.h
@@ -4,7 +4,7 @@
*
* VMS-specific configuration file (specification only).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/vms/ftsystem.c
index e700eac5c8a..31b08708f7d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/vms/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/vms/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* VMS-specific FreeType low-level system interface (body). */
/* */
-/* Copyright (C) 1996-2022 by */
+/* Copyright (C) 1996-2021 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/wince/ftdebug.c b/Build/source/libs/freetype2/freetype-src/builds/wince/ftdebug.c
index 7a4fac5d21d..9e177766157 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/wince/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/wince/ftdebug.c
@@ -4,7 +4,7 @@
*
* Debugging and logging component for WinCE (body).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
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 2289c76b803..3e42cf99253 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.12.0 sources:
+It compiles the following libraries from the FreeType 2.11.1 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 de0f3405812..645675c721a 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.12.0 sources:
+It compiles the following libraries from the FreeType 2.11.1 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk
index 759a2e640a9..3eef47aaa9e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c b/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c
index a65f5446941..94c22da7525 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/ftdebug.c
@@ -4,7 +4,7 @@
*
* Debugging and logging component for Win32 (body).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -136,8 +136,6 @@
va_start( ap, fmt );
vfprintf( stderr, fmt, ap );
-#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
- ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 )
if ( IsDebuggerPresent() )
{
static char buf[1024];
@@ -146,7 +144,6 @@
vsnprintf( buf, sizeof buf, fmt, ap );
OutputDebugStringA( buf );
}
-#endif
va_end( ap );
}
@@ -162,8 +159,6 @@
va_start( ap, fmt );
vfprintf( stderr, fmt, ap );
-#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
- ( defined( _WIN32_WCE ) && _WIN32_WCE >= 0x0600 )
if ( IsDebuggerPresent() )
{
static char buf[1024];
@@ -172,7 +167,6 @@
vsnprintf( buf, sizeof buf, fmt, ap );
OutputDebugStringA( buf );
}
-#endif
va_end( ap );
exit( EXIT_FAILURE );
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c
index 4f4ac15f331..1ebadd49ff8 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/ftsystem.c
@@ -4,7 +4,7 @@
*
* Windows-specific FreeType low-level system interface (body).
*
- * Copyright (C) 2021-2022 by
+ * Copyright (C) 2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -196,78 +196,19 @@
}
- /* non-desktop Universal Windows Platform */
-#if defined( WINAPI_FAMILY_PARTITION ) && \
- !WINAPI_FAMILY_PARTITION( WINAPI_PARTITION_DESKTOP )
-
-#define PACK_DWORD64( hi, lo ) ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
-
-#define CreateFileMapping( a, b, c, d, e, f ) \
- CreateFileMappingFromApp( a, b, c, PACK_DWORD64( d, e ), f )
-#define MapViewOfFile( a, b, c, d, e ) \
- MapViewOfFileFromApp( a, b, PACK_DWORD64( c, d ), e )
+#ifdef _WIN32_WCE
FT_LOCAL_DEF( HANDLE )
- CreateFileA( LPCSTR lpFileName,
- DWORD dwDesiredAccess,
- DWORD dwShareMode,
- LPSECURITY_ATTRIBUTES lpSecurityAttributes,
- DWORD dwCreationDisposition,
- DWORD dwFlagsAndAttributes,
- HANDLE hTemplateFile )
+ CreateFileA( LPCSTR lpFileName,
+ DWORD dwDesiredAccess,
+ DWORD dwShareMode,
+ LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+ DWORD dwCreationDisposition,
+ DWORD dwFlagsAndAttributes,
+ HANDLE hTemplateFile )
{
- int len;
- LPWSTR lpFileNameW;
-
- CREATEFILE2_EXTENDED_PARAMETERS createExParams = {
- sizeof ( CREATEFILE2_EXTENDED_PARAMETERS ),
- dwFlagsAndAttributes & 0x0000FFFF,
- dwFlagsAndAttributes & 0xFFF00000,
- dwFlagsAndAttributes & 0x000F0000,
- lpSecurityAttributes,
- hTemplateFile };
-
-
- /* allocate memory space for converted path name */
- len = MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
- lpFileName, -1, NULL, 0 );
-
- lpFileNameW = (LPWSTR)_alloca( len * sizeof ( WCHAR ) );
-
- if ( !len || !lpFileNameW )
- {
- FT_ERROR(( "FT_Stream_Open: cannot convert file name to LPWSTR\n" ));
- return INVALID_HANDLE_VALUE;
- }
-
- /* now it is safe to do the translation */
- MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
- lpFileName, -1, lpFileNameW, len );
-
- /* open the file */
- return CreateFile2( lpFileNameW, dwDesiredAccess, dwShareMode,
- dwCreationDisposition, &createExParams );
- }
-
-#endif
-
-
-#if defined( _WIN32_WCE )
-
- /* malloc.h provides implementation of alloca()/_alloca() */
- #include
-
- FT_LOCAL_DEF( HANDLE )
- CreateFileA( LPCSTR lpFileName,
- DWORD dwDesiredAccess,
- DWORD dwShareMode,
- LPSECURITY_ATTRIBUTES lpSecurityAttributes,
- DWORD dwCreationDisposition,
- DWORD dwFlagsAndAttributes,
- HANDLE hTemplateFile )
- {
- int len;
- LPWSTR lpFileNameW;
+ int len;
+ LPWSTR lpFileNameW;
/* allocate memory space for converted path name */
@@ -292,15 +233,10 @@
dwFlagsAndAttributes, hTemplateFile );
}
-#endif
-
-
-#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
- !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
FT_LOCAL_DEF( BOOL )
- GetFileSizeEx( HANDLE hFile,
- PLARGE_INTEGER lpFileSize )
+ GetFileSizeEx( HANDLE hFile,
+ PLARGE_INTEGER lpFileSize )
{
lpFileSize->u.LowPart = GetFileSize( hFile,
(DWORD *)&lpFileSize->u.HighPart );
@@ -312,7 +248,7 @@
return TRUE;
}
-#endif
+#endif /* _WIN32_WCE */
/* documentation is in ftobjs.h */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
index 4c9e2b497cf..0d38678dbb7 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
@@ -485,7 +485,6 @@
-
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters
index 4085f6c4d9b..3f68c826086 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj.filters
@@ -68,9 +68,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -146,4 +143,4 @@
Source Files
-
+
\ No newline at end of file
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 02b9c1b30de..dcb1944b82c 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.12.0 sources:
+from the FreeType 2.11.1 sources:
- freetype.dll using 'Release' or 'Debug' configurations
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj
index a16782c2306..4cbb6b9e73a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/freetype.vcproj
@@ -434,18 +434,10 @@
/>
-
-
-
-
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 0dabfe2b9f0..d0c8f2f9473 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.12.0 sources:
+It compiles the following libraries from the FreeType 2.11.1 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 d11978e37c5..b50ef79b060 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.12.0 sources:
+It compiles the following libraries from the FreeType 2.11.1 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk
index b88dbac6ed5..d497dd15dc6 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk
index 2be492cef15..701b83d25c7 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-bccd.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk
index a58f8247d2f..a2f464479ef 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-dev.mk
@@ -5,7 +5,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk
index 52b893339fc..4117453ec33 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-gcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk
index a05a3a7896b..ebab45ef2c6 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-icc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk
index fb5c96090f1..0fef8d72453 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-intl.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk
index 66de0aa5642..7aed5b5177a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-lcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk
index e3b89697a6c..6731778855a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-mingw32.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk
index 4a48407a27e..278624f375d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-vcc.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk
index 4458b23418b..df2ece36569 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/w32-wat.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk b/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk
index eb96181ddc6..15bfd0cfd1a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/win32-def.mk
@@ -3,7 +3,7 @@
#
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/configure b/Build/source/libs/freetype2/freetype-src/configure
index 404f13ce2d2..584e6ec3806 100755
--- a/Build/source/libs/freetype2/freetype-src/configure
+++ b/Build/source/libs/freetype2/freetype-src/configure
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2002-2022 by
+# Copyright (C) 2002-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/devel/ft2build.h b/Build/source/libs/freetype2/freetype-src/devel/ft2build.h
index 92bc9e01a19..117532ba494 100644
--- a/Build/source/libs/freetype2/freetype-src/devel/ft2build.h
+++ b/Build/source/libs/freetype2/freetype-src/devel/ft2build.h
@@ -4,7 +4,7 @@
*
* FreeType 2 build and setup macros (development version).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/devel/ftoption.h b/Build/source/libs/freetype2/freetype-src/devel/ftoption.h
index b2363d74c13..f92b4167aa3 100644
--- a/Build/source/libs/freetype2/freetype-src/devel/ftoption.h
+++ b/Build/source/libs/freetype2/freetype-src/devel/ftoption.h
@@ -4,7 +4,7 @@
*
* User-selectable configuration macros (specification only).
*
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
*
* This file is part of the FreeType project, and may only be used,
@@ -219,10 +219,6 @@ FT_BEGIN_HEADER
* If you use a build system like cmake or the `configure` script,
* options set by those programs have precedence, overwriting the value
* here with the configured one.
- *
- * If you use the GNU make build system directly (that is, without the
- * `configure` script) and you define this macro, you also have to pass
- * `SYSTEM_ZLIB=yes` as an argument to make.
*/
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -525,20 +521,6 @@ FT_BEGIN_HEADER
#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
- /**************************************************************************
- *
- * OpenType SVG Glyph Support
- *
- * Setting this macro enables support for OpenType SVG glyphs. By
- * default, FreeType can only fetch SVG documents. However, it can also
- * render them if external rendering hook functions are plugged in at
- * runtime.
- *
- * More details on the hooks can be found in file `otsvg.h`.
- */
-#define FT_CONFIG_OPTION_SVG
-
-
/**************************************************************************
*
* Error Strings
@@ -1018,9 +1000,9 @@ FT_BEGIN_HEADER
#error "Invalid CFF darkening parameters!"
#endif
-
FT_END_HEADER
+
#endif /* FTOPTION_H_ */
diff --git a/Build/source/libs/freetype2/freetype-src/docs/CHANGES b/Build/source/libs/freetype2/freetype-src/docs/CHANGES
index 0f2d83b69c3..5eb8cdb947e 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/CHANGES
+++ b/Build/source/libs/freetype2/freetype-src/docs/CHANGES
@@ -1,54 +1,3 @@
-CHANGES BETWEEN 2.11.1 and 2.12.0
-
- I. IMPORTANT CHANGES
-
- - FreeType now handles OT-SVG fonts, to be controlled with
- `FT_CONFIG_OPTION_SVG` configuration macro. By default, it can
- only load the 'SVG ' table of an OpenType font. However, by using
- the `svg-hooks` property of the new 'ot-svg' module it is possible
- to register an external SVG rendering engine. The FreeType demo
- programs have been set up to use 'librsvg' as the rendering
- library.
-
- This work was Moazin Khatti's GSoC 2019 project.
-
-
- II. MISCELLANEOUS
-
- - The handling of fonts with an 'sbix' table has been improved.
-
- - Corrected bitmap offsets.
-
- - A new tag `FT_PARAM_TAG_IGNORE_SBIX` for `FT_Open_Face` makes
- FreeType ignore an 'sbix' table in a font, allowing applications
- to access the font's outline glyphs.
-
- - `FT_FACE_FLAG_SBIX` and `FT_FACE_FLAG_SBIX_OVERLAY` together
- with their corresponding preprocessor macros `FT_HAS_SBIX` and
- `FT_HAS_SBIX_OVERLAY` enable applications to treat 'sbix' tables
- as described in the OpenType specification.
-
- - The internal 'zlib' code has been updated to be in sync with the
- current 'zlib' version (1.2.11).
-
- - The previously internal load flag `FT_LOAD_SBITS_ONLY` is now
- public.
-
- - Some minor improvements of the building systems, in particular
- handling of the 'zlib' library (internal vs. external).
-
- - Support for non-desktop Universal Windows Platform.
-
- - Various other minor bug and documentation fixes.
-
- - The `ftdump` demo program shows more information for Type1 fonts
- if option `-n` is given.
-
- - `ftgrid` can now display embedded bitmap strikes.
-
-
-======================================================================
-
CHANGES BETWEEN 2.11.0 and 2.11.1
I. IMPORTANT CHANGES
@@ -5500,7 +5449,7 @@ Extensions support:
------------------------------------------------------------------------
-Copyright (C) 2000-2022 by
+Copyright (C) 2000-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/CUSTOMIZE b/Build/source/libs/freetype2/freetype-src/docs/CUSTOMIZE
index 1a750825b25..a03f9ddd04b 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/CUSTOMIZE
+++ b/Build/source/libs/freetype2/freetype-src/docs/CUSTOMIZE
@@ -139,7 +139,7 @@ IV. Overriding default configuration and module headers
----------------------------------------------------------------------
-Copyright (C) 2003-2022 by
+Copyright (C) 2003-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/DEBUG b/Build/source/libs/freetype2/freetype-src/docs/DEBUG
index fd2de134d5d..4f358779afc 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/DEBUG
+++ b/Build/source/libs/freetype2/freetype-src/docs/DEBUG
@@ -297,7 +297,7 @@ to access them.
------------------------------------------------------------------------
-Copyright (C) 2002-2022 by
+Copyright (C) 2002-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/DOCGUIDE b/Build/source/libs/freetype2/freetype-src/docs/DOCGUIDE
index 3dbe499d69c..499608d5713 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/DOCGUIDE
+++ b/Build/source/libs/freetype2/freetype-src/docs/DOCGUIDE
@@ -285,7 +285,7 @@ is converted to
----------------------------------------------------------------------
-Copyright (C) 2018-2022 by
+Copyright (C) 2018-2021 by
Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL b/Build/source/libs/freetype2/freetype-src/docs/INSTALL
index 2a2bc5e5a57..be56e02c554 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL
@@ -101,7 +101,7 @@ III. Custom builds of the library
----------------------------------------------------------------------
-Copyright (C) 2000-2022 by
+Copyright (C) 2000-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.ANY b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.ANY
index ceb76f5a9f7..31366131603 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.ANY
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.ANY
@@ -144,7 +144,7 @@ II. Support for flat-directory compilation
----------------------------------------------------------------------
-Copyright (C) 2003-2022 by
+Copyright (C) 2003-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.CROSS b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.CROSS
index 931a4d7963e..f57b14c8400 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.CROSS
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.CROSS
@@ -163,7 +163,7 @@ procedure.
----------------------------------------------------------------------
-Copyright (C) 2006-2022 by
+Copyright (C) 2006-2021 by
suzuki toshiya, David Turner, Robert Wilhelm, and Werner Lemberg.
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.GNU b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.GNU
index 5e161ad943e..a04e6fc1c5c 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.GNU
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.GNU
@@ -168,7 +168,7 @@ instructions in the file `INSTALL.UNIX' instead.
----------------------------------------------------------------------
-Copyright (C) 2003-2022 by
+Copyright (C) 2003-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.UNIX b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.UNIX
index b6f63c87141..ff4eabedfd1 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.UNIX
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.UNIX
@@ -126,7 +126,7 @@ or MSys on Win32:
----------------------------------------------------------------------
-Copyright (C) 2003-2022 by
+Copyright (C) 2003-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.VMS b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.VMS
index 6cd390d95eb..f0dec3bd14b 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/INSTALL.VMS
+++ b/Build/source/libs/freetype2/freetype-src/docs/INSTALL.VMS
@@ -49,7 +49,7 @@ V7.2-1.
------------------------------------------------------------------------
-Copyright (C) 2000-2022 by
+Copyright (C) 2000-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/TODO b/Build/source/libs/freetype2/freetype-src/docs/TODO
index 623866eab9b..ecc1efdbee7 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/TODO
+++ b/Build/source/libs/freetype2/freetype-src/docs/TODO
@@ -27,7 +27,7 @@ Other bugs have been registered at the savannah bugzilla of FreeType.
------------------------------------------------------------------------
-Copyright (C) 2001-2022 by
+Copyright (C) 2001-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT b/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
index d2d0b3ad5e3..afe50a4c681 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
+++ b/Build/source/libs/freetype2/freetype-src/docs/VERSIONS.TXT
@@ -60,7 +60,6 @@ found on _most_ systems, but not all of them:
release libtool so
-------------------------------
- 2.12.0 24.2.18 6.18.2
2.11.1 24.1.18 6.18.1
2.11.0 24.0.18 6.18.0
2.10.4 23.4.17 6.17.4
@@ -120,7 +119,7 @@ other release numbers.
----------------------------------------------------------------------
-Copyright (C) 2002-2022 by
+Copyright (C) 2002-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/formats.txt b/Build/source/libs/freetype2/freetype-src/docs/formats.txt
index e0cafbaa4bd..1c25ac00b62 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/formats.txt
+++ b/Build/source/libs/freetype2/freetype-src/docs/formats.txt
@@ -200,7 +200,7 @@ which isn't supported yet please send a mail too.
------------------------------------------------------------------------
-Copyright (C) 2004-2022 by
+Copyright (C) 2004-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
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 a735f489640..8145c9f2e0d 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 "March 2022" "FreeType 2.12.0"
+.TH FREETYPE-CONFIG 1 "December 2021" "FreeType 2.11.1"
.
.
.SH NAME
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.20 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.20
index d3173240640..15ae8fe9763 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.20
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.20
@@ -2597,7 +2597,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2000-2022 by
+Copyright (C) 2000-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.21 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.21
index e8a36ae0f23..71f9f00db31 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.21
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.21
@@ -9422,7 +9422,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2002-2022 by
+Copyright (C) 2002-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.210 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.210
index 6139fe8da6a..eea4d27b33a 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.210
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.210
@@ -7799,7 +7799,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2018-2022 by
+Copyright (C) 2018-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.22 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.22
index e7e13604d90..e25cafccfa9 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.22
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.22
@@ -2821,7 +2821,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2005-2022 by
+Copyright (C) 2005-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.23 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.23
index d0792cba03e..0e32ca8e05c 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.23
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.23
@@ -7932,7 +7932,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2006-2022 by
+Copyright (C) 2006-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.24 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.24
index aa9ca8c2639..9d06b0f54d2 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.24
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.24
@@ -6344,7 +6344,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2010-2022 by
+Copyright (C) 2010-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.25 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.25
index a2b6a91c3b5..5d0371c498f 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.25
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.25
@@ -5145,7 +5145,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2013-2022 by
+Copyright (C) 2013-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.26 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.26
index 59dd6022a23..eb87803b139 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.26
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.26
@@ -5695,7 +5695,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2015-2022 by
+Copyright (C) 2015-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.27 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.27
index d35e3446e17..c5fb1f9a6df 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.27
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.27
@@ -2090,7 +2090,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2016-2022 by
+Copyright (C) 2016-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.28 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.28
index 8e655e4d980..d7cc2e01220 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.28
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.28
@@ -3120,7 +3120,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2016-2022 by
+Copyright (C) 2016-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.29 b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.29
index 1274085f4fd..e668b4f00b4 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.29
+++ b/Build/source/libs/freetype2/freetype-src/docs/oldlogs/ChangeLog.29
@@ -2336,7 +2336,7 @@
----------------------------------------------------------------------------
-Copyright (C) 2017-2022 by
+Copyright (C) 2017-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/docs/raster.txt b/Build/source/libs/freetype2/freetype-src/docs/raster.txt
index 05fbe4917a7..72d9fe28088 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/raster.txt
+++ b/Build/source/libs/freetype2/freetype-src/docs/raster.txt
@@ -618,7 +618,7 @@ II. Rendering Technology
------------------------------------------------------------------------
-Copyright (C) 2003-2022 by
+Copyright (C) 2003-2021 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
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 6923c4935de..4c8afae1666 100644
--- a/Build/source/libs/freetype2/freetype-src/docs/reference/404.html
+++ b/Build/source/libs/freetype2/freetype-src/docs/reference/404.html
@@ -6,7 +6,7 @@
-
+
@@ -18,7 +18,7 @@
- FreeType-2.12.0 API Reference
+ FreeType-2.11.1 API Reference
@@ -77,7 +77,7 @@