[fontconfig] Update to 2.13.94

ports/fontconfig/CONTROL

@@ -1,6 +1,6 @@
 Source: fontconfig
-Version: 2.13.1
-Port-Version: 7
+Version: 2.13.94
+Port-Version: 8
 Homepage: https://www.freedesktop.org/software/fontconfig/front.html
 Description: Library for configuring and customizing font access.
 Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, libuuid (!windows&!osx&!mingw), gettext

ports/fontconfig/build.patch

@@ -41,13 +41,13 @@ diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
 index 87e302083..8b5012110 100644
 --- a/fc-cache/fc-cache.c
 +++ b/fc-cache/fc-cache.c
-@@ -34,11 +34,20 @@
+@@ -34,16 +34,23 @@
  #include <fontconfig/fontconfig.h>
  #include <stdio.h>
  #include <stdlib.h>
-+#ifdef HAVE_UNISTD_H
+ #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-+#endif
+ #endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -59,20 +59,23 @@ index 87e302083..8b5012110 100644
 +#if HAVE_FCNTL_H
  #include <fcntl.h>
 +#endif
+ #ifdef HAVE_DIRENT_H
  #include <dirent.h>
+ #endif
  #include <string.h>
  #include <locale.h>
+
 diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
 index 69611bcc3..e7b0efbaa 100644
 --- a/fc-cat/fc-cat.c
 +++ b/fc-cat/fc-cat.c
-@@ -36,9 +36,16 @@
+@@ -36,11 +36,16 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-+#ifdef HAVE_UNISTD_H
+ #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-+#endif
+ #endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -87,13 +90,13 @@ diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c
 index 5c40a0f09..affaca09e 100644
 --- a/fc-conflist/fc-conflist.c
 +++ b/fc-conflist/fc-conflist.c
-@@ -35,7 +35,12 @@
+@@ -35,9 +35,12 @@
 
  #include <fontconfig/fontconfig.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
+ #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-+#endif
+ #endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -104,13 +107,10 @@ diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
 index 2039acd36..0e56b1c32 100644
 --- a/fc-list/fc-list.c
 +++ b/fc-list/fc-list.c
-@@ -24,7 +24,12 @@
+@@ -24,6 +24,9 @@
 
  #include <fontconfig/fontconfig.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -121,13 +121,10 @@ diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
 index dee61479d..da8d820aa 100644
 --- a/fc-match/fc-match.c
 +++ b/fc-match/fc-match.c
-@@ -33,7 +33,12 @@
+@@ -33,6 +33,9 @@
 
  #include <fontconfig/fontconfig.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -138,13 +135,10 @@ diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
 index 7989b816f..15b43e098 100644
 --- a/fc-pattern/fc-pattern.c
 +++ b/fc-pattern/fc-pattern.c
-@@ -33,7 +33,12 @@
+@@ -33,6 +33,9 @@
 
  #include <fontconfig/fontconfig.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -155,13 +149,10 @@ diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
 index fbffb8415..58c251fe3 100644
 --- a/fc-query/fc-query.c
 +++ b/fc-query/fc-query.c
-@@ -36,7 +36,12 @@
+@@ -36,6 +36,9 @@
  #include <fontconfig/fontconfig.h>
  #include <fontconfig/fcfreetype.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -172,13 +163,10 @@ diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
 index 9302ac559..3a0ccf188 100644
 --- a/fc-scan/fc-scan.c
 +++ b/fc-scan/fc-scan.c
-@@ -36,7 +36,12 @@
+@@ -36,6 +36,9 @@
  #include <fontconfig/fontconfig.h>
  #include <fontconfig/fcfreetype.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
@@ -189,66 +177,32 @@ diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c
 index 2ceee2024..8f702f190 100644
 --- a/fc-validate/fc-validate.c
 +++ b/fc-validate/fc-validate.c
-@@ -36,7 +36,12 @@
+@@ -36,6 +36,9 @@
  #include <fontconfig/fontconfig.h>
  #include <fontconfig/fcfreetype.h>
  #include <stdio.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
  #include <stdlib.h>
  #include <string.h>
  #include <locale.h>
-diff --git a/src/fcatomic.c b/src/fcatomic.c
-index d12d32408..da7234934 100644
---- a/src/fcatomic.c
-+++ b/src/fcatomic.c
-@@ -50,7 +50,9 @@
- #include "fcint.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
- #include <stdlib.h>
- #include <time.h>
-
-diff --git a/src/fccache.c b/src/fccache.c
-index 2b604014e..50fb742c6 100644
---- a/src/fccache.c
-+++ b/src/fccache.c
-@@ -30,7 +30,9 @@
- #include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifndef _MSC_VER
- #include <sys/time.h>
-+#endif
- #include <assert.h>
- #if defined(HAVE_MMAP) || defined(__CYGWIN__)
- #  include <unistd.h>
 diff --git a/src/fcint.h b/src/fcint.h
 index de78cd8c9..4fb269ffa 100644
 --- a/src/fcint.h
 +++ b/src/fcint.h
-@@ -40,7 +40,18 @@
+@@ -40,9 +40,15 @@
  #include <limits.h>
  #include <float.h>
  #include <math.h>
-+#ifdef HAVE_UNISTD_H
+ #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-+#endif
+ #endif
 +#ifdef _MSC_VER
 +#include <direct.h>
 +#include <io.h>
 +#include <BaseTsd.h>
 +#define ssize_t SSIZE_T
-+#define F_OK 0
-+#define W_OK 2
-+typedef int mode_t;
 +#endif
  #include <stddef.h>
  #include <sys/types.h>
@@ -257,22 +211,21 @@ diff --git a/test/test-migration.c b/test/test-migration.c
 index b7d96dcce..7eac59dcc 100644
 --- a/test/test-migration.c
 +++ b/test/test-migration.c
-@@ -28,13 +28,16 @@
+@@ -28,14 +28,16 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
 +#ifdef _MSC_VER
 +#include <io.h>
 +#endif
  #include <sys/types.h>
  #include <dirent.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
  #ifndef HAVE_STRUCT_DIRENT_D_TYPE
 -#include <sys/types.h>
  #include <sys/stat.h>
--#include <unistd.h>
  #endif
  #include <fontconfig/fontconfig.h>
 

ports/fontconfig/extra-escaping.patch

@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 7c1a697..93ccf1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -499,7 +499,7 @@ FC_DEFAULT_FONTS=""
+ if test x${default_fonts+set} = xset; then
+ 	fc_IFS=$IFS
+ 	IFS=","
+-	for p in "$default_fonts"; do
++	for p in $default_fonts; do
+ 		FC_DEFAULT_FONTS="$FC_DEFAULT_FONTS\t<dir>$p</dir>\n"
+ 	done
+ 	IFS=$fc_IFS

ports/fontconfig/portfile.cmake

@@ -1,4 +1,4 @@
-set(FONTCONFIG_VERSION 2.13.1)
+set(FONTCONFIG_VERSION 2.13.94)
 
 if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
     set(PATCHES fix_def_dll_name.patch)
@@ -8,21 +8,24 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fontconfig/fontconfig
-    REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1
-    SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58
+    REF e291fda7d42e5d64379555097a066d9c2c4efce3 #v2.13.1
+    SHA512 d531bf9bc0dcae418c1f5936bb2847e94ed03f3097d16eb10cbff52d02999d2052b05e3491205739174f238bcb387f63820f5ff4cf996e232f413a511aede990
     HEAD_REF master # branch name
     PATCHES remove_tests.patch
             build.patch
-            build2.patch
             disable-install-data.patch
-            macos_arm_fccache.patch
+            extra-escaping.patch
             ${PATCHES}
 )
 
 vcpkg_find_acquire_program(GPERF)
 get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
 vcpkg_add_to_path(${GPERF_PATH})
 
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path(${GPERF_PATH})
+
 vcpkg_configure_make(
     AUTOCONFIG
     COPY_SOURCE
@@ -104,7 +107,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    # Unnecessary make rule creating the fontconfig cache dir on windows. 
+    # Unnecessary make rule creating the fontconfig cache dir on windows.
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE")
 endif()
 

versions/baseline.json

@@ -2065,8 +2065,8 @@
       "port-version": 0
     },
     "fontconfig": {
-      "baseline": "2.13.1",
-      "port-version": 7
+      "baseline": "2.13.94",
+      "port-version": 8
     },
     "foonathan-memory": {
       "baseline": "2019-07-21-1",

versions/f-/fontconfig.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a3dfba4a6e109cc4fa43a881c193161edb5ca9ed",
+      "version-string": "2.13.94",
+      "port-version": 8
+    },
     {
       "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2",
       "version-string": "2.13.1",