[intl/gettext/fontconfig] update to native build system (#11776)

* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

14 files changed, 421 insertions, 924 deletions

diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt
deleted file mode 100644
index 61197ed92..000000000
--- a/ports/fontconfig/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-project(fontconfig C)
-
-add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H)
-
-# find dependencies
-find_package(unofficial-iconv CONFIG REQUIRED)
-find_package(Freetype REQUIRED)
-find_package(expat CONFIG REQUIRED)
-
-add_library(fontconfig
-    src/fcatomic.c
-    src/fcblanks.c
-    src/fccache.c
-    src/fccfg.c
-    src/fccharset.c
-    src/fccompat.c
-    src/fcdbg.c
-    src/fcdefault.c
-    src/fcdir.c
-    src/fcformat.c
-    src/fcfreetype.c
-    src/fcfs.c
-    src/fcinit.c
-    src/fclang.c
-    src/fclist.c
-    src/fcmatch.c
-    src/fcmatrix.c
-    src/fcname.c
-    src/fcobjs.c
-    src/fcpat.c
-    src/fcrange.c
-    src/fcserialize.c
-    src/fcstat.c
-    src/fcstr.c
-    src/fcweight.c
-    src/fcxml.c
-    src/ftglue.c)
-
-if(WIN32)
-    set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__declspec(dllexport)")
-else()
-    set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__attribute__((visibility(\"default\")))")
-endif()
-
-target_include_directories(fontconfig PRIVATE .
-    ${FC_INCLUDE_DIR}/alias
-    ${EXPAT_INCLUDE_DIR})
-if(WIN32)
-    target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/win32)
-else()
-    target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix)
-endif()
-
-target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype expat::expat)
-
-install(TARGETS fontconfig
-    EXPORT fontconfig-targets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
-
-if(NOT FC_SKIP_HEADERS)
-    install(FILES
-        fontconfig/fontconfig.h
-        fontconfig/fcfreetype.h
-        fontconfig/fcprivate.h
-        DESTINATION include/fontconfig)
-endif()
-
-if(NOT FC_SKIP_TOOLS)
-    set(FC_DEFAULT_FONTS WINDOWSFONTDIR)
-    set(FC_FONTPATH)
-    set(FC_CACHEDIR WINDOWSTEMPDIR_FONTCONFIG_CACHE)
-    set(CONFIGDIR ./fonts/conf.d)
-    configure_file(fonts.conf.in ${CMAKE_SOURCE_DIR}/fonts.conf @ONLY)
-    install(FILES fonts.conf DESTINATION tools/fontconfig)
-    install(DIRECTORY conf.d DESTINATION tools/fontconfig FILES_MATCHING PATTERN "*.conf")
-endif()
-
-install(
-    EXPORT fontconfig-targets
-    NAMESPACE unofficial::fontconfig::
-    FILE unofficial-fontconfig-targets.cmake
-    DESTINATION share/unofficial-fontconfig
-)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake "
-include(CMakeFindDependencyMacro)
-find_dependency(unofficial-iconv CONFIG)
-find_dependency(Freetype)
-find_dependency(expat CONFIG)
-
-include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake)
-")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig)
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index e541f560a..636b7499a 100644
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@@ -1,7 +1,5 @@
 Source: fontconfig
-Version: 2.12.4
-Port-Version: 13
+Version: 2.13.1
 Homepage: https://www.freedesktop.org/software/fontconfig/front.html
 Description: Library for configuring and customizing font access.
-Build-Depends: freetype, expat, libiconv, dirent
-Supports: !uwp
\ No newline at end of file
+Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext
\ No newline at end of file
diff --git a/ports/fontconfig/build.patch b/ports/fontconfig/build.patch
new file mode 100644
index 000000000..5b8c1b3a9
--- /dev/null
+++ b/ports/fontconfig/build.patch
@@ -0,0 +1,295 @@
+diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
+index ff03fb2eb..769fc6005 100644
+--- a/conf.d/Makefile.am
++++ b/conf.d/Makefile.am
+@@ -95,9 +95,9 @@ install-data-hook:
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+ 	  cd $(DESTDIR)$(configdir);				\
+ 	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
++	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
+ 	    $(RM) $$i;						\
+-	    ln -s $(templatedir)/$$i .;				\
++	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;				\
+ 	  done)
+ uninstall-local:
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 35e820d60..42bd7c5a2 100644
+--- a/src/Makefile.am	
++++ b/src/Makefile.am
+@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def
+ 
+ install-libtool-import-lib: libfontconfig.la
+ 	$(MKDIR_P) $(DESTDIR)$(libdir)
+-	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
++#	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
+ 	$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
+ 
+ uninstall-libtool-import-lib:
+@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la
+ 	lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@
+ 
+ install-ms-import-lib:
+-	$(INSTALL) fontconfig.lib $(DESTDIR)$(libdir)
++	$(MKDIR_P) $(DESTDIR)$(libdir)
++	$(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir)
+ 
+ uninstall-ms-import-lib:
+ 	$(RM) $(DESTDIR)$(libdir)/fontconfig.lib
+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 @@
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <sys/types.h>
++#if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
++#endif
+ #include <errno.h>
++#if HAVE_FCNTL_H
+ #include <fcntl.h>
++#endif
+ #include <dirent.h>
+ #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 @@
+ #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>
++#if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
++#endif
+ #include <errno.h>
+ #include <locale.h>
+ 
+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 @@
+ 
+ #include <fontconfig/fontconfig.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/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 @@
+ 
+ #include <fontconfig/fontconfig.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/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 @@
+ 
+ #include <fontconfig/fontconfig.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/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 @@
+ 
+ #include <fontconfig/fontconfig.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/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 @@
+ #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/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 @@
+ #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/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 @@
+ #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 @@
+ #include <limits.h>
+ #include <float.h>
+ #include <math.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#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>
+ #include <sys/stat.h>
+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 @@
+ #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>
+ #ifndef HAVE_STRUCT_DIRENT_D_TYPE
+-#include <sys/types.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ #endif
+ #include <fontconfig/fontconfig.h>
+ 
+diff --git a/test/test-pthread.c b/test/test-pthread.c
+index fbf397d4c..38d7dea35 100644
+--- a/test/test-pthread.c
++++ b/test/test-pthread.c
+@@ -24,7 +24,12 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <pthread.h>
+ #include <fontconfig/fontconfig.h>
+ 
diff --git a/ports/fontconfig/build2.patch b/ports/fontconfig/build2.patch
new file mode 100644
index 000000000..13bacf15d
--- /dev/null
+++ b/ports/fontconfig/build2.patch
@@ -0,0 +1,35 @@
+diff --git a/Tools.mk b/Tools.mk
+index f0fa0ec50..24e5afd16 100644
+--- a/Tools.mk
++++ b/Tools.mk
+@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
+ 	   $(WARN_CFLAGS)
+ 
+ $(TOOL): $(TSRC) $(ALIAS_FILES)
+-	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
++	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL)
+ 
+ $(TARG): $(TMPL) $(TSRC) $(DEPS)
+ 	$(AM_V_GEN) $(MAKE) $(TOOL) && \
+diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c
+index 236bff5f0..6fb21c855 100644
+--- a/fc-case/fc-case.c
++++ b/fc-case/fc-case.c
+@@ -345,7 +345,7 @@ main (int argc, char **argv)
+ 	    break;
+ 	fputs (line, stdout);
+     }
+-    
++    fflush (stdout);
+     /*
+      * Dump these tables
+      */
+@@ -354,7 +354,7 @@ main (int argc, char **argv)
+     /*
+      * And flush out the rest of the input file
+      */
+-
++    fflush (stdout);
+     while (fgets (line, sizeof (line), stdin))
+ 	fputs (line, stdout);
+     
diff --git a/ports/fontconfig/fcobjtypehash.patch b/ports/fontconfig/fcobjtypehash.patch
deleted file mode 100644
index e0db68942..000000000
--- a/ports/fontconfig/fcobjtypehash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 33bba8d..e6b0808 100644
---- a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -24,11 +24,13 @@
- 
- #include "fcint.h"
- 
-+#if 0
- static unsigned int
- FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- 
- static const struct FcObjectTypeInfo *
- FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
-+#endif
- 
- #include "fcobjshash.h"
- 
diff --git a/ports/fontconfig/include/alias/fcalias.h b/ports/fontconfig/include/alias/fcalias.h
deleted file mode 100644
index e69de29bb..000000000
--- a/ports/fontconfig/include/alias/fcalias.h
+++ /dev/null
diff --git a/ports/fontconfig/include/alias/fcaliastail.h b/ports/fontconfig/include/alias/fcaliastail.h
deleted file mode 100644
index a9eae81f2..000000000
--- a/ports/fontconfig/include/alias/fcaliastail.h
+++ /dev/null
@@ -1 +0,0 @@
-/* intentionally empty */
diff --git a/ports/fontconfig/include/alias/fcftalias.h b/ports/fontconfig/include/alias/fcftalias.h
deleted file mode 100644
index e69de29bb..000000000
--- a/ports/fontconfig/include/alias/fcftalias.h
+++ /dev/null
diff --git a/ports/fontconfig/include/alias/fcftaliastail.h b/ports/fontconfig/include/alias/fcftaliastail.h
deleted file mode 100644
index a9eae81f2..000000000
--- a/ports/fontconfig/include/alias/fcftaliastail.h
+++ /dev/null
@@ -1 +0,0 @@
-/* intentionally empty */
diff --git a/ports/fontconfig/include/unix/config.h b/ports/fontconfig/include/unix/config.h
deleted file mode 100644
index 5b5da3792..000000000
--- a/ports/fontconfig/include/unix/config.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-#define FC_CACHEDIR "./"
-
-/* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 8
-
-/* The normal alignment of `void *', in bytes. */
-#if defined(_WIN64)
-#define ALIGNOF_VOID_P 8
-#else
-#define ALIGNOF_VOID_P 4
-#endif
-
-/* Use libxml2 instead of Expat */
-/* #undef ENABLE_LIBXML2 */
-
-/* Additional font directories */
-#define FC_ADD_FONTS "yes"
-
-/* Architecture prefix to use for cache file names */
-/* #undef FC_ARCHITECTURE */
-
-/* System font directory */
-#define FC_DEFAULT_FONTS ""
-
-/* The type of len parameter of the gperf hash/lookup function */
-#define FC_GPERF_SIZE_T size_t
-
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#define FLEXIBLE_ARRAY_MEMBER /**/
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fstatfs' function. */
-/* #undef HAVE_FSTATFS */
-
-/* Define to 1 if you have the `fstatvfs' function. */
-/* #undef HAVE_FSTATVFS */
-
-/* FT_Bitmap_Size structure includes y_ppem field */
-#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-
-/* Define to 1 if you have the `FT_Get_BDF_Property' function. */
-#define HAVE_FT_GET_BDF_PROPERTY 1
-
-/* Define to 1 if you have the `FT_Get_Next_Char' function. */
-#define HAVE_FT_GET_NEXT_CHAR 1
-
-/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */
-#define HAVE_FT_GET_PS_FONT_INFO 1
-
-/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */
-#define HAVE_FT_GET_X11_FONT_FORMAT 1
-
-/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */
-#define HAVE_FT_HAS_PS_GLYPH_NAMES 1
-
-/* Define to 1 if you have the `FT_Select_Size' function. */
-#define HAVE_FT_SELECT_SIZE 1
-
-/* Define to 1 if you have the `getexecname' function. */
-/* #undef HAVE_GETEXECNAME */
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getprogname' function. */
-/* #undef HAVE_GETPROGNAME */
-
-/* Have Intel __sync_* atomic primitives */
-#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `link' function. */
-/* #undef HAVE_LINK */
-
-/* Define to 1 if you have the `lrand48' function. */
-/* #undef HAVE_LRAND48 */
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkdtemp' function. */
-/* #undef HAVE_MKDTEMP */
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the 'posix_fadvise' function. */
-/* #undef HAVE_POSIX_FADVISE */
-
-/* Have POSIX threads */
-#define HAVE_PTHREAD 1
-
-/* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `random' function. */
-/* #undef HAVE_RANDOM */
-
-/* Define to 1 if you have the `random_r' function. */
-/* #undef HAVE_RANDOM_R */
-
-/* Define to 1 if you have the `rand_r' function. */
-/* #undef HAVE_RAND_R */
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Have sched_yield */
-/* #undef HAVE_SCHED_YIELD */
-
-/* Have Solaris __machine_*_barrier and atomic_* operations */
-/* #undef HAVE_SOLARIS_ATOMIC_OPS */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
-
-/* Define to 1 if `f_flags' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
-
-/* Define to 1 if `st_mtim' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-/* #undef HAVE_SYS_MOUNT_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-/* #undef HAVE_SYS_STATFS_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-/* #undef HAVE_SYS_VFS_H */
-
-/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1
-
-/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Can use #warning in C files */
-#define HAVE_WARNING_CPP_DIRECTIVE 1
-
-/* Use xmlparse.h instead of expat.h */
-/* #undef HAVE_XMLPARSE_H */
-
-/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */
-#define HAVE_XML_SETDOCTYPEDECLHANDLER 1
-
-/* Define to 1 if you have the `_mktemp_s' function. */
-/* #undef HAVE__MKTEMP_S */
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "fontconfig"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "fontconfig"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.12.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "fontconfig"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.12.3"
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void*', as computed by sizeof. */
-/* #undef SIZEOF_VOIDP */
-
-/* The size of `void *', as computed by sizeof. */
-#if defined(_WIN64)
-#define SIZEOF_VOIDP 8
-#define SIZEOF_VOID_P 8
-#else
-#define SIZEOF_VOIDP 4
-#define SIZEOF_VOID_P 4
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Use iconv. */
-#define USE_ICONV 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "2.12.3"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-#define FONTCONFIG_PATH "/etc/fonts"
-
-#include "config-fixups.h"
diff --git a/ports/fontconfig/include/win32/config.h b/ports/fontconfig/include/win32/config.h
deleted file mode 100644
index 0fbdead6e..000000000
--- a/ports/fontconfig/include/win32/config.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-#define FC_CACHEDIR "./"
-
-/* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 8
-
-/* The normal alignment of `void *', in bytes. */
-#if defined(_WIN64)
-#define ALIGNOF_VOID_P 8
-#else
-#define ALIGNOF_VOID_P 4
-#endif
-
-/* Use libxml2 instead of Expat */
-/* #undef ENABLE_LIBXML2 */
-
-/* Additional font directories */
-#define FC_ADD_FONTS "yes"
-
-/* Architecture prefix to use for cache file names */
-/* #undef FC_ARCHITECTURE */
-
-/* System font directory */
-#define FC_DEFAULT_FONTS "WINDOWSFONTDIR"
-
-/* The type of len parameter of the gperf hash/lookup function */
-#define FC_GPERF_SIZE_T size_t
-
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#define FLEXIBLE_ARRAY_MEMBER /**/
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fstatfs' function. */
-/* #undef HAVE_FSTATFS */
-
-/* Define to 1 if you have the `fstatvfs' function. */
-/* #undef HAVE_FSTATVFS */
-
-/* FT_Bitmap_Size structure includes y_ppem field */
-#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-
-/* Define to 1 if you have the `FT_Get_BDF_Property' function. */
-#define HAVE_FT_GET_BDF_PROPERTY 1
-
-/* Define to 1 if you have the `FT_Get_Next_Char' function. */
-#define HAVE_FT_GET_NEXT_CHAR 1
-
-/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */
-#define HAVE_FT_GET_PS_FONT_INFO 1
-
-/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */
-#define HAVE_FT_GET_X11_FONT_FORMAT 1
-
-/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */
-#define HAVE_FT_HAS_PS_GLYPH_NAMES 1
-
-/* Define to 1 if you have the `FT_Select_Size' function. */
-#define HAVE_FT_SELECT_SIZE 1
-
-/* Define to 1 if you have the `getexecname' function. */
-/* #undef HAVE_GETEXECNAME */
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getprogname' function. */
-/* #undef HAVE_GETPROGNAME */
-
-/* Have Intel __sync_* atomic primitives */
-#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `link' function. */
-/* #undef HAVE_LINK */
-
-/* Define to 1 if you have the `lrand48' function. */
-/* #undef HAVE_LRAND48 */
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkdtemp' function. */
-/* #undef HAVE_MKDTEMP */
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the 'posix_fadvise' function. */
-/* #undef HAVE_POSIX_FADVISE */
-
-/* Have POSIX threads */
-/* #undef HAVE_PTHREAD */
-
-/* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `random' function. */
-/* #undef HAVE_RANDOM */
-
-/* Define to 1 if you have the `random_r' function. */
-/* #undef HAVE_RANDOM_R */
-
-/* Define to 1 if you have the `rand_r' function. */
-/* #undef HAVE_RAND_R */
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Have sched_yield */
-/* #undef HAVE_SCHED_YIELD */
-
-/* Have Solaris __machine_*_barrier and atomic_* operations */
-/* #undef HAVE_SOLARIS_ATOMIC_OPS */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
-
-/* Define to 1 if `f_flags' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
-
-/* Define to 1 if `st_mtim' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-/* #undef HAVE_SYS_MOUNT_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-/* #undef HAVE_SYS_STATFS_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-/* #undef HAVE_SYS_VFS_H */
-
-/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1
-
-/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Can use #warning in C files */
-#define HAVE_WARNING_CPP_DIRECTIVE 1
-
-/* Use xmlparse.h instead of expat.h */
-/* #undef HAVE_XMLPARSE_H */
-
-/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */
-#define HAVE_XML_SETDOCTYPEDECLHANDLER 1
-
-/* Define to 1 if you have the `_mktemp_s' function. */
-#define HAVE__MKTEMP_S 1
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "fontconfig"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "fontconfig"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.12.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "fontconfig"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.12.3"
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void*', as computed by sizeof. */
-/* #undef SIZEOF_VOIDP */
-
-/* The size of `void *', as computed by sizeof. */
-#if defined(_WIN64)
-#define SIZEOF_VOIDP 8
-#define SIZEOF_VOID_P 8
-#else
-#define SIZEOF_VOIDP 4
-#define SIZEOF_VOID_P 4
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Use iconv. */
-#define USE_ICONV 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "2.12.3"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-#include "config-fixups.h"
diff --git a/ports/fontconfig/include/win32/unistd.h b/ports/fontconfig/include/win32/unistd.h
deleted file mode 100644
index 7d04abe29..000000000
--- a/ports/fontconfig/include/win32/unistd.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Minimal unistd.h, just to get fontconfig to compile */
-#ifndef UNISTD_H
-#define UNISTD_H
-
-#include <io.h>
-
-#ifndef R_OK
-#define R_OK 4
-#endif
-
-#ifndef W_OK
-#define W_OK 2
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
-
-typedef int mode_t;
-
-#endif
\ No newline at end of file
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index 5d9492f70..b4641e352 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -1,52 +1,95 @@
-vcpkg_fail_port_install(ON_TARGET "uwp")
+set(FONTCONFIG_VERSION 2.13.1)
 
-set(FONTCONFIG_VERSION 2.12.4)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${FONTCONFIG_VERSION}
-    PATCHES fcobjtypehash.patch
+    REPO fontconfig/fontconfig
+    REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1
+    SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58
+    HEAD_REF master # branch name
+    PATCHES remove_tests.patch
+            build.patch
+            build2.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_find_acquire_program(GPERF)
+get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
+vcpkg_add_to_path(${GPERF_PATH})
 
-vcpkg_configure_cmake(
+vcpkg_configure_make(
+    AUTOCONFIG
+    COPY_SOURCE
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
-        -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include
+        --disable-docs
+        ${OPTIONS}
+        ac_cv_type_pid_t=yes
+        --enable-iconv
+        "--with-libiconv=${CURRENT_INSTALLED_DIR}"
+        "--with-libiconv-includes=${CURRENT_INSTALLED_DIR}/include"
     OPTIONS_DEBUG
-        -DFC_SKIP_TOOLS=ON
-        -DFC_SKIP_HEADERS=ON
+        "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/debug/lib"
+        ${OPT_DBG}
+    OPTIONS_RELEASE
+        "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/lib"
+        ${OPT_REL}
+    ADD_BIN_TO_PATH
+    ADDITIONAL_MSYS_PACKAGES xz findutils gettext gettext-devel  # for autopoint
 )
 
-vcpkg_install_cmake()
+vcpkg_install_make(ADD_BIN_TO_PATH)
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES uuid)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)
+# Fix paths in debug pc file.
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc")
+if(EXISTS "${_file}")
+    file(READ "${_file}" _contents)
+    string(REPLACE "/etc" "/../etc" _contents "${_contents}")
+    string(REPLACE "/var" "/../var" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
 
-vcpkg_copy_pdbs()
+# Make path to cache in fonts.conf relative
+set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
+if(EXISTS "${_file}")
+    file(READ "${_file}" _contents)
+    string(REPLACE "${CURRENT_INSTALLED_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig" _contents "${_contents}")
+    string(REPLACE "/var" "/../var" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var"
+                    "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/etc")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)")
+    else()
+        set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))")
+    endif()
     foreach(HEADER fcfreetype.h fontconfig.h)
-        if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-            vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}
-               "#define FcPublic"
-               "#define FcPublic __declspec(dllimport)"
-            )
-        else()
-            vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}
-               "#define FcPublic"
-               "#define FcPublic __attribute__((visibility(\"default\")))"
-            )
-        endif()
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}"
+            "#define FcPublic"
+            "${DEFINE_FC_PUBLIC}"
+        )
     endforeach()
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+
+## Build the fontconfig cache
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts")
+    set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
+    vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
+                                   WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+                                   LOGNAME fc-cache-${TARGET_TRIPLET})
+endif()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    # Unnecessary make rule creating the fontconfig cache dir on windows. 
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE")
+endif()
\ No newline at end of file
diff --git a/ports/fontconfig/remove_tests.patch b/ports/fontconfig/remove_tests.patch
new file mode 100644
index 000000000..0f9e1b8fc
--- /dev/null
+++ b/ports/fontconfig/remove_tests.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index cc3024e68..e58f8688c 100644
+--- a/Makefile.am
++++ b/Makefile.am	
+@@ -24,7 +24,7 @@
+ SUBDIRS=fontconfig fc-case fc-lang src \
+ 	fc-cache fc-cat fc-conflist fc-list fc-match \
+ 	fc-pattern fc-query fc-scan fc-validate conf.d \
+-	its po po-conf test
++	its po po-conf
+ if ENABLE_DOCS
+ SUBDIRS += doc
+ endif