Merge commit '42608f77f20749dd6ddc9e0536788eaad70ea4b5'

.gitlab-ci.yml

@@ -1,5 +1,11 @@
 # 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
 
@@ -48,17 +54,7 @@ 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.
@@ -69,14 +65,31 @@ 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 $env:VS_UWP &&
-        meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
-        meson compile --verbose -C build
-        $env:MESON_WINDOWS_TESTS"
+    - 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"
 
 
 # Format of job names:
-# <OS> <Build-Tool> <Build-Params> <Architecture>
+# <OS> <Build-Tool> <Build-Params> <Architecture>:
 
 
 # Windows jobs.
@@ -85,20 +98,18 @@ 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 meson vs2019 amd64 uwp:
-  extends: '.build windows meson'
+windows msbuild vs2019 amd64:
+  extends: '.build windows msbuild'
   variables:
     ARCH: 'amd64'
-    VS_UWP: '-app_platform=UWP'
-    MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'
+    PLATFORM: 'x64'
+
 
 # Linux Jobs.
 #

.mailmap

@@ -19,7 +19,7 @@ Anurag Thakur (अनुराग ठाकुर) <[email protected]>
 David Turner <[email protected]> <[email protected]>
 David Turner <[email protected]> <[email protected]>
 Anuj Verma (अनुज वर्मा) <[email protected]>
-Ben Wagner <[email protected]> Bungeman <[email protected]>
+Ben Wagner <[email protected]>
 Ben Wagner <[email protected]> <[email protected]>
 Ben Wagner <[email protected]> <[email protected]>
 Nikolaus Waxweiler <[email protected]> <[email protected]>

CMakeLists.txt

@@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright (C) 2013-2023 by
+# Copyright (C) 2013-2024 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <[email protected]>
@@ -110,7 +110,7 @@
 
 # To minimize the number of cmake_policy() workarounds,
 # CMake >= 3 is requested.
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.5)
 
 if (NOT CMAKE_VERSION VERSION_LESS 3.3)
   # Allow symbol visibility settings also on static libraries. CMake < 3.3
@@ -164,7 +164,7 @@ project(freetype C)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "13")
-set(VERSION_PATCH "2")
+set(VERSION_PATCH "3")
 
 # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
 set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
@@ -265,6 +265,8 @@ if (NOT FT_DISABLE_PNG)
   else ()
     find_package(PNG)
   endif ()
+  # FreePNG calls FindZLIB so unset ZLIB_FOUND to respect FT_DISABLE_ZLIB
+  unset(ZLIB_FOUND)
 endif ()
 
 if (NOT FT_DISABLE_ZLIB)
@@ -297,7 +299,7 @@ if (NOT FT_DISABLE_BROTLI)
 endif ()
 
 # Create the configuration file
-if (UNIX)
+if (UNIX AND NOT WIN32)
   check_include_file("unistd.h" HAVE_UNISTD_H)
   check_include_file("fcntl.h" HAVE_FCNTL_H)
 
@@ -423,10 +425,10 @@ set(BASE_SRCS
   src/winfonts/winfnt.c
 )
 
-if (UNIX)
-  list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
-elseif (WIN32)
+if (WIN32)
   list(APPEND BASE_SRCS "builds/windows/ftsystem.c")
+elseif (UNIX)
+  list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
 else ()
   list(APPEND BASE_SRCS "src/base/ftsystem.c")
 endif ()

MSBuild.rsp

@@ -0,0 +1,2 @@
+#/p:WindowsTargetPlatformVersion=10.0.16299.0
+/p:Configuration="Release"

builds/windows/vc2010/freetype.sln → MSBuild.sln

@@ -1,6 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+#
+# 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}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Makefile

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

README

@@ -1,4 +1,4 @@
-FreeType 2.13.2
+FreeType 2.13.3
 ===============
 
 Homepage: https://www.freetype.org
@@ -32,9 +32,9 @@ sites.  Go to
 
 and download one of the following files.
 
-  freetype-doc-2.13.2.tar.xz
-  freetype-doc-2.13.2.tar.gz
-  ftdoc2132.zip
+  freetype-doc-2.13.3.tar.xz
+  freetype-doc-2.13.3.tar.gz
+  ftdoc2133.zip
 
 To view the documentation online, go to
 
@@ -94,7 +94,7 @@ Enjoy!
 
 ----------------------------------------------------------------------
 
-Copyright (C) 2006-2023 by
+Copyright (C) 2006-2024 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

README.git

@@ -89,7 +89,7 @@ address:
 
 ----------------------------------------------------------------------
 
-Copyright (C) 2005-2023 by
+Copyright (C) 2005-2024 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

autogen.sh

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

builds/amiga/README

@@ -1,7 +1,7 @@
 
 README for the builds/amiga subdirectory.
 
-Copyright (C) 2005-2023 by
+Copyright (C) 2005-2024 by
 Werner Lemberg and Detlef W�rkner.
 
 This file is part of the FreeType project, and may only be used, modified,

builds/amiga/include/config/ftconfig.h

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright (C) 2005-2023 by                                             */
+/*  Copyright (C) 2005-2024 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */

builds/amiga/include/config/ftmodule.h

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright (C) 2005-2023 by                                             */
+/*  Copyright (C) 2005-2024 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */

builds/amiga/makefile

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

builds/amiga/makefile.os4

@@ -4,7 +4,7 @@
 #
 
 
-# Copyright (C) 2005-2023 by
+# Copyright (C) 2005-2024 by
 # Werner Lemberg and Detlef W�rkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/amiga/smakefile

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

builds/amiga/src/base/ftdebug.c

@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component for amiga (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
  *
  * This file is part of the FreeType project, and may only be used,

builds/amiga/src/base/ftsystem.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright (C) 1996-2023 by                                             */
+/*  Copyright (C) 1996-2024 by                                             */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */

builds/ansi/ansi-def.mk

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

builds/ansi/ansi.mk

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

builds/beos/beos-def.mk

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

builds/beos/beos.mk

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

builds/beos/detect.mk

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

builds/cmake/FindBrotliDec.cmake

@@ -1,6 +1,6 @@
 # FindBrotliDec.cmake
 #
-# Copyright (C) 2019-2023 by
+# Copyright (C) 2019-2024 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by Werner Lemberg <[email protected]>

builds/cmake/iOS.cmake

@@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright (C) 2014-2023 by
+# Copyright (C) 2014-2024 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <[email protected]>

builds/cmake/testbuild.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# Copyright (C) 2015-2023 by
+# Copyright (C) 2015-2024 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/ansi-cc.mk

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