Revert some changes from newer versions and move to stable.

2024-07-18 21:42:10 +03:00
609 changed files with 4209 additions and 3979 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,11 +1,5 @@
 # CI setup for FreeType.

-# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/540
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_PIPELINE_SOURCE == 'push'
-
 stages:
 - build

@ -54,7 +48,17 @@ variables:
    # Make sure meson is up to date so we don't need to rebuild the image
    # with each release.
    - pip3 install -U 'meson==0.59.*'
+    - pip3 install --upgrade certifi
    - pip3 install -U ninja
+
+    # Generate a UWP cross-file in case it's used
+    - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
+    - echo "[binaries]" > uwp-crossfile.meson
+    - echo "c = 'cl'" >> uwp-crossfile.meson
+    - echo "strip = ['true']" >> uwp-crossfile.meson
+    - echo "[built-in options]" >> uwp-crossfile.meson
+    - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
+    - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
  script:
    # For some reason, options are separated by newlines instead of spaces,
    # so we have to replace them first.
@ -65,31 +69,14 @@ variables:
    # script.  Environment variables substitutions is done by PowerShell
    # before calling `cmd.exe`, that's why we use `$env:FOO` instead of
    # `%FOO%`.
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-        meson setup build $env:MESON_ARGS_WINDOWS &&
-        meson compile --verbose -C build &&
-        meson test -C build &&
-        meson test -C build --benchmark"
-
-
-.build windows msbuild:
-  extends: '.build windows common'
-  variables:
-    # Make sure any failure in PowerShell scripts is fatal.
-    ErrorActionPreference: 'Stop'
-    WarningPreference: 'Stop'
-  script:
-    - git submodule update --init --recursive
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-      MSBuild.exe -clp:ForceConsoleColor -t:Rebuild
-               -p:Configuration=Debug
-               -p:Platform=$env:PLATFORM
-               -p:UserDefines=FT_DEBUG_LOGGING
-               MSBuild.sln"
+    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
+        meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
+        meson compile --verbose -C build
+        $env:MESON_WINDOWS_TESTS"


 # Format of job names:
-# <OS> <Build-Tool> <Build-Params> <Architecture>:
+# <OS> <Build-Tool> <Build-Params> <Architecture>


 # Windows jobs.
@ -98,18 +85,20 @@ windows meson vs2019 amd64:
  extends: '.build windows meson'
  variables:
    ARCH: 'amd64'
+    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'

 windows meson vs2019 x86:
  extends: '.build windows meson'
  variables:
    ARCH: 'x86'
+    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'

-windows msbuild vs2019 amd64:
-  extends: '.build windows msbuild'
+windows meson vs2019 amd64 uwp:
+  extends: '.build windows meson'
  variables:
    ARCH: 'amd64'
-    PLATFORM: 'x64'
-
+    VS_UWP: '-app_platform=UWP'
+    MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'

 # Linux Jobs.
 #
--- a/.mailmap
+++ b/.mailmap
@ -19,7 +19,7 @@ Anurag Thakur (अनुराग ठाकुर) <anuthadev@gmail.com>
 David Turner <david@freetype.org> <david.turner.dev@gmail.com>
 David Turner <david@freetype.org> <digit@google.com>
 Anuj Verma (अनुज वर्मा) <anujv@iitbhilai.ac.in>
-Ben Wagner <bungeman@gmail.com>
+Ben Wagner <bungeman@gmail.com> Bungeman <bungeman@gmail.com>
 Ben Wagner <bungeman@gmail.com> <bungeman@google.com>
 Ben Wagner <bungeman@gmail.com> <bungeman@chromium.org>
 Nikolaus Waxweiler <madigens@gmail.com> <nikolaus.waxweiler@daltonmaag.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright (C) 2013-2024 by
+# Copyright (C) 2013-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <cary@txcorp.com>
@ -110,7 +110,7 @@

 # To minimize the number of cmake_policy() workarounds,
 # CMake >= 3 is requested.
-cmake_minimum_required(VERSION 3.0...3.5)
+cmake_minimum_required(VERSION 3.0)

 if (NOT CMAKE_VERSION VERSION_LESS 3.3)
  # Allow symbol visibility settings also on static libraries. CMake < 3.3
@ -297,7 +297,7 @@ if (NOT FT_DISABLE_BROTLI)
 endif ()

 # Create the configuration file
-if (UNIX AND NOT WIN32)
+if (UNIX)
  check_include_file("unistd.h" HAVE_UNISTD_H)
  check_include_file("fcntl.h" HAVE_FCNTL_H)

@ -423,10 +423,10 @@ set(BASE_SRCS
  src/winfonts/winfnt.c
 )

-if (WIN32)
-  list(APPEND BASE_SRCS "builds/windows/ftsystem.c")
-elseif (UNIX)
+if (UNIX)
  list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
+elseif (WIN32)
+  list(APPEND BASE_SRCS "builds/windows/ftsystem.c")
 else ()
  list(APPEND BASE_SRCS "src/base/ftsystem.c")
 endif ()
--- a/MSBuild.rsp
+++ b/MSBuild.rsp
@ -1,2 +0,0 @@
-#/p:WindowsTargetPlatformVersion=10.0.16299.0
-/p:Configuration="Release"
--- a/2
+++ b/2
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/2
+++ b/2
@ -94,7 +94,7 @@ Enjoy!

 ----------------------------------------------------------------------

-Copyright (C) 2006-2024 by
+Copyright (C) 2006-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/README.git
+++ b/README.git
@ -89,7 +89,7 @@ address:

 ----------------------------------------------------------------------

-Copyright (C) 2005-2024 by
+Copyright (C) 2005-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/autogen.sh
+++ b/autogen.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -190,7 +190,8 @@ if test -e ".git"; then
    :
  else
    echo "Checking out submodule in \`subprojects/dlg':"
-    git submodule update --init
+    git submodule init
+    git submodule update
  fi

  copy_submodule_files
--- a/builds/amiga/README
+++ b/builds/amiga/README
@ -1,7 +1,7 @@

 README for the builds/amiga subdirectory.

-Copyright (C) 2005-2024 by
+Copyright (C) 2005-2023 by
 Werner Lemberg and Detlef Würkner.

 This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/include/config/ftconfig.h
+++ b/builds/amiga/include/config/ftconfig.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright (C) 2005-2024 by                                             */
+/*  Copyright (C) 2005-2023 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/amiga/include/config/ftmodule.h
+++ b/builds/amiga/include/config/ftmodule.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright (C) 2005-2024 by                                             */
+/*  Copyright (C) 2005-2023 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@ -5,7 +5,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2023 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@ -4,7 +4,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2023 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2023 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/src/base/ftdebug.c
+++ b/builds/amiga/src/base/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for amiga (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/amiga/src/base/ftsystem.c
+++ b/builds/amiga/src/base/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright (C) 1996-2024 by                                             */
+/*  Copyright (C) 1996-2023 by                                             */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/ansi/ansi.mk
+++ b/builds/ansi/ansi.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/beos-def.mk
+++ b/builds/beos/beos-def.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/beos.mk
+++ b/builds/beos/beos.mk
@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #

-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/detect.mk
+++ b/builds/beos/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/cmake/FindBrotliDec.cmake
+++ b/builds/cmake/FindBrotliDec.cmake
@ -1,6 +1,6 @@
 # FindBrotliDec.cmake
 #
-# Copyright (C) 2019-2024 by
+# Copyright (C) 2019-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by Werner Lemberg <wl@gnu.org>
--- a/builds/cmake/iOS.cmake
+++ b/builds/cmake/iOS.cmake
@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright (C) 2014-2024 by
+# Copyright (C) 2014-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <david@wimsey.us>
--- a/builds/cmake/testbuild.sh
+++ b/builds/cmake/testbuild.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-# Copyright (C) 2015-2024 by
+# Copyright (C) 2015-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/ansi-cc.mk
+++ b/builds/compiler/ansi-cc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/bcc-dev.mk
+++ b/builds/compiler/bcc-dev.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/bcc.mk
+++ b/builds/compiler/bcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/emx.mk
+++ b/builds/compiler/emx.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/gcc-dev.mk
+++ b/builds/compiler/gcc-dev.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/gcc.mk
+++ b/builds/compiler/gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/intelc.mk
+++ b/builds/compiler/intelc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/unix-lcc.mk
+++ b/builds/compiler/unix-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/visualage.mk
+++ b/builds/compiler/visualage.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/visualc.mk
+++ b/builds/compiler/visualc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/watcom.mk
+++ b/builds/compiler/watcom.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/win-lcc.mk
+++ b/builds/compiler/win-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/detect.mk
+++ b/builds/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-emx.mk
+++ b/builds/dos/dos-emx.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-gcc.mk
+++ b/builds/dos/dos-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-wat.mk
+++ b/builds/dos/dos-wat.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/exports.mk
+++ b/builds/exports.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/mac/ftmac.c
+++ b/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-2024 by                                             */
+/*  Copyright (C) 1996-2023 by                                             */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/meson/extract_freetype_version.py
+++ b/builds/meson/extract_freetype_version.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/extract_libtool_version.py
+++ b/builds/meson/extract_libtool_version.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/generate_reference_docs.py
+++ b/builds/meson/generate_reference_docs.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/parse_modules_cfg.py
+++ b/builds/meson/parse_modules_cfg.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/process_ftoption_h.py
+++ b/builds/meson/process_ftoption_h.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/modules.mk
+++ b/builds/modules.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //

-// Copyright (C) 2008-2024 by
+// Copyright (C) 2008-2023 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/builds/symbian/freetype.mmp
+++ b/builds/symbian/freetype.mmp
@ -2,7 +2,7 @@
 // FreeType 2 makefile for the symbian platform
 //

-// Copyright (C) 2008-2024 by
+// Copyright (C) 2008-2023 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -170,7 +170,8 @@ endif # test check_platform

 check_out_submodule:
 	$(info Checking out submodule in `subprojects/dlg')
-	git -C $(TOP_DIR) submodule update --init
+	git --git-dir=$(TOP_DIR) submodule init
+	git --git-dir=$(TOP_DIR) submodule update

 copy_submodule:
 	$(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright (C) 2001-2024 by
+# Copyright (C) 2001-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2000-2024 by
+# Copyright (C) 2000-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/freetype2.m4
+++ b/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-2024 by
+# Copyright (C) 2001-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/ft-munmap.m4
+++ b/builds/unix/ft-munmap.m4
@ -1,6 +1,6 @@
 ## FreeType specific autoconf tests
 #
-# Copyright (C) 2002-2024 by
+# Copyright (C) 2002-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/ftconfig.h.in
+++ b/builds/unix/ftconfig.h.in
@ -4,7 +4,7 @@
 *
 *   UNIX-specific configuration file (specification only).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@ -4,7 +4,7 @@
 *
 *   Unix-specific FreeType low-level system interface (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@ -2,7 +2,7 @@
 # FreeType 2 template for Unix-specific compiler definitions
 #

-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-dev.mk
+++ b/builds/unix/unix-dev.mk
@ -6,7 +6,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-lcc.mk
+++ b/builds/unix/unix-lcc.mk
@ -6,7 +6,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@ -4,7 +4,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@ -4,7 +4,7 @@
 *
 *   VMS-specific configuration file (specification only).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/vms/ftsystem.c
+++ b/builds/vms/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific FreeType low-level system interface (body).             */
 /*                                                                         */
-/*  Copyright (C) 1996-2024 by                                             */
+/*  Copyright (C) 1996-2023 by                                             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/wince/ftdebug.c
+++ b/builds/wince/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for WinCE (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/windows/detect.mk
+++ b/builds/windows/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for Win32 (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/windows/ftsystem.c
+++ b/builds/windows/ftsystem.c
@ -4,7 +4,7 @@
 *
 *   Windows-specific FreeType low-level system interface (body).
 *
- * Copyright (C) 2021-2024 by
+ * Copyright (C) 2021-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
@ -196,8 +196,8 @@
  }


-  /* support for Universal Windows Platform UWP, formerly WinRT */
-#ifdef _WINRT_DLL
+  /* non-desktop Universal Windows Platform */
+#if defined( WINAPI_FAMILY ) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP

 #define PACK_DWORD64( hi, lo )  ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )

@ -248,11 +248,10 @@
                        dwCreationDisposition, &createExParams );
  }

-#endif  /* _WINRT_DLL */
+#endif


-  /* support for Windows CE */
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE )

  /* malloc.h provides implementation of alloca()/_alloca() */
  #include <malloc.h>
@ -292,9 +291,9 @@
                        dwFlagsAndAttributes, hTemplateFile );
  }

-#endif  /* _WIN32_WCE */
+#endif
+

-  /* support for really old Windows */
 #if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
    !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400

@ -312,7 +311,7 @@
      return TRUE;
  }

-#endif  /* _WIN32_WCE || _WIN32_WINDOWS || _WIN32_WINNT <= 0x0400 */
+#endif


  /* documentation is in ftobjs.h */
--- a/builds/windows/vc2010/freetype.sln
+++ b/builds/windows/vc2010/freetype.sln
@ -1,20 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio Express 2012 for Windows Desktop
-#
-# You can build FreeType with MSBuild as follows
-#
-#    MSBuild.exe -t:Rebuild
-#                -p:Configuration=Debug
-#                -p:Platform=x64
-#                -p:UserDefines=FT_DEBUG_LOGGING
-#                   MSBuild.sln
-#
-# or with different appropriate switches. The library file
-# freetype.dll and/or freetype.lib should appear in the objs/
-# folder. A copy should be sent to ../freetype-demos/bin/
-# to be used with the demo programs.
-#
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "builds\windows\vc2010\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/builds/windows/w32-bcc.mk
+++ b/builds/windows/w32-bcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-bccd.mk
+++ b/builds/windows/w32-bccd.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-dev.mk
+++ b/builds/windows/w32-dev.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-gcc.mk
+++ b/builds/windows/w32-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-icc.mk
+++ b/builds/windows/w32-icc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-intl.mk
+++ b/builds/windows/w32-intl.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-lcc.mk
+++ b/builds/windows/w32-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-mingw32.mk
+++ b/builds/windows/w32-mingw32.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-vcc.mk
+++ b/builds/windows/w32-vcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-wat.mk
+++ b/builds/windows/w32-wat.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/win32-def.mk
+++ b/builds/windows/win32-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2002-2024 by
+# Copyright (C) 2002-2023 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/devel/ft2build.h
+++ b/devel/ft2build.h
@ -4,7 +4,7 @@
 *
 *   FreeType 2 build and setup macros (development version).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@ -4,7 +4,7 @@
 *
 *   User-selectable configuration macros (specification only).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2023 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
@ -757,22 +757,6 @@ FT_BEGIN_HEADER
 #endif


-  /**************************************************************************
-   *
-   * Option `TT_CONFIG_OPTION_GPOS_KERNING` enables a basic GPOS kerning
-   * implementation (for TrueType fonts only).  With this defined, FreeType
-   * is able to get kerning pair data from the GPOS 'kern' feature as well as
-   * legacy 'kern' tables; without this defined, FreeType will only be able
-   * to use legacy 'kern' tables.
-   *
-   * Note that FreeType does not support more advanced GPOS layout features;
-   * even the 'kern' feature implemented here doesn't handle more
-   * sophisticated kerning variants.  Use a higher-level library like
-   * HarfBuzz instead for that.
-   */
-#define TT_CONFIG_OPTION_GPOS_KERNING
-
-
  /*************************************************************************/
  /*************************************************************************/
  /****                                                                 ****/
--- a/docs/CHANGES
+++ b/docs/CHANGES
@ -1,43 +1,3 @@
-CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Mmm-DD)
-
-  I. IMPORTANT CHANGES
-
-  - Some  fields  in  the  `FT_Outline` structure  have been   changed
-    from signed  to unsigned type,  which  better reflects  the actual
-    usage.   It  is  also  an  additional  means  to  protect  against
-    malformed input.
-
-
-  II. IMPORTANT BUG FIXES
-
-  - Rare double-free crashes in the cache subsystem have been fixed.
-
-  - Excessive stack allocation in the autohinter has been fixed.
-
-
-  III. MISCELLANEOUS
-
-  - The B/W rasterizer  has  received a major upkeep  that resulted in
-    large performance improvement.  The rendering speed  has increased
-    and even doubled for very complex glyphs.
-
-  - If the new configuration option `TT_CONFIG_OPTION_GPOS_KERNING` is
-    defined,  `FT_Get_Kerning`  understands rudimentary  GPOS  kerning
-    (for TrueType fonts  only).  This is not enabled  by default since
-    its usage  is very  limited, mainly  for legacy  applications that
-    have to support TrueType fonts automatically converted from 'kern'
-    tables to GPOS kerning.  If you need proper (GPOS) kerning support
-    please use a higher-level library like HarfBuzz.
-
-    Code contributed by David Saltzman <davidbsaltzman@gmail.com>.
-
-  - The internal structures  `PS_DesignMap` and `PS_Blend` related  to
-    parsing of old Multiple Masters fonts  have been removed  from the
-    public header file `t1tables.h`.
-
-
-======================================================================
-
 CHANGES BETWEEN 2.13.1 and 2.13.2 (2023-Aug-25)

  I. MISCELLANEOUS
@ -5708,7 +5668,7 @@ Extensions support:

 ------------------------------------------------------------------------

-Copyright (C) 2000-2024 by
+Copyright (C) 2000-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file  is  part  of the  FreeType  project, and may  only be  used,
--- a/docs/CUSTOMIZE
+++ b/docs/CUSTOMIZE
@ -139,7 +139,7 @@ IV. Overriding default configuration and module headers

 ----------------------------------------------------------------------

-Copyright (C) 2003-2024 by
+Copyright (C) 2003-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/docs/DEBUG
+++ b/docs/DEBUG
@ -297,7 +297,7 @@ to access them.

 ------------------------------------------------------------------------

-Copyright (C) 2002-2024 by
+Copyright (C) 2002-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part  of the  FreeType  project, and  may  only be  used,
--- a/docs/DOCGUIDE
+++ b/docs/DOCGUIDE
@ -285,7 +285,7 @@ is converted to

 ----------------------------------------------------------------------

-Copyright (C) 2018-2024 by
+Copyright (C) 2018-2023 by
 Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/docs/INSTALL
+++ b/docs/INSTALL
@ -59,7 +59,7 @@ II. Normal installation and upgrades

      CMake   :: see `CMakeLists.txt` for more information
      Meson   :: see `meson.build` for more information
-      MSBuild :: see `MSBuild.sln` for more information
+      MSBuild :: see `builds/windows/vc2010/freetype.vcxproj`
      MMS     :: see `vms_make.com` and `docs/INSTALL.VMS`


@ -101,7 +101,7 @@ III. Custom builds of the library

 ----------------------------------------------------------------------

-Copyright (C) 2000-2024 by
+Copyright (C) 2000-2023 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/Show More
+++ b/Show More