fontconfig: Update to 2.13.0

6 files changed, 52 insertions, 18 deletions

diff --git a/pkg/fontconfig/.gitignore b/pkg/fontconfig/.gitignore
index 668883a6..d0917a06 100644
--- a/pkg/fontconfig/.gitignore
+++ b/pkg/fontconfig/.gitignore
@@ -1,2 +1,2 @@
-/fontconfig-2.12.6.tar.gz
-/src
\ No newline at end of file
+/fontconfig-2.13.0.tar.gz
+/src
diff --git a/pkg/fontconfig/config.h b/pkg/fontconfig/config.h
index ce81b043..a13522be 100644
--- a/pkg/fontconfig/config.h
+++ b/pkg/fontconfig/config.h
@@ -1,38 +1,65 @@
-#include <config-posix.h>
-
 #define FC_CACHEDIR "/var/cache/fontconfig"
+#define FC_TEMPLATEDIR "/share/fontconfig/conf.avail"
 #define FONTCONFIG_PATH "/etc/fonts"
 
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 #define ALIGNOF_DOUBLE 8
 #define ALIGNOF_VOID_P 8
 /* #undef ENABLE_LIBXML2 */
+/* #undef ENABLE_NLS */
 #define FC_ADD_FONTS "yes"
 /* #undef FC_ARCHITECTURE */
-#define FC_DEFAULT_FONTS "/share/fonts"
+#define FC_DEFAULT_FONTS "/usr/share/fonts"
 #define FC_GPERF_SIZE_T size_t
 #define FLEXIBLE_ARRAY_MEMBER /**/
+#define GETTEXT_PACKAGE "fontconfig"
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+/* #undef HAVE_DCGETTEXT */
+#define HAVE_DIRENT_H 1
+#define HAVE_DLFCN_H 1
 /* #undef HAVE_DOPRNT */
+#define HAVE_FCNTL_H 1
 #define HAVE_FSTATFS 1
-#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
+#define HAVE_FSTATVFS 1
+#define HAVE_FT_DONE_MM_VAR 1
 #define HAVE_FT_GET_BDF_PROPERTY 1
-#define HAVE_FT_GET_NEXT_CHAR 1
 #define HAVE_FT_GET_PS_FONT_INFO 1
 #define HAVE_FT_GET_X11_FONT_FORMAT 1
 #define HAVE_FT_HAS_PS_GLYPH_NAMES 1
-#define HAVE_FT_SELECT_SIZE 1
 /* #undef HAVE_GETEXECNAME */
+#define HAVE_GETOPT 1
 #define HAVE_GETOPT_LONG 1
 #define HAVE_GETPAGESIZE 1
 /* #undef HAVE_GETPROGNAME */
+/* #undef HAVE_GETTEXT */
+/* #undef HAVE_ICONV */
 #define HAVE_INTEL_ATOMIC_PRIMITIVES 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LINK 1
+#define HAVE_LRAND48 1
+#define HAVE_LSTAT 1
 #define HAVE_MEMORY_H 1
+#define HAVE_MKDTEMP 1
 #define HAVE_MKOSTEMP 1
+#define HAVE_MKSTEMP 1
+#define HAVE_MMAP 1
 /* #undef HAVE_NDIR_H */
+#define HAVE_POSIX_FADVISE 1
 #define HAVE_PTHREAD 1
 #define HAVE_PTHREAD_PRIO_INHERIT 1
+#define HAVE_RAND 1
+#define HAVE_RANDOM 1
 /* #undef HAVE_RANDOM_R */
+#define HAVE_RAND_R 1
+#define HAVE_READLINK 1
+/* #undef HAVE_SCHED_H */
+/* #undef HAVE_SCHED_YIELD */
 /* #undef HAVE_SOLARIS_ATOMIC_OPS */
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
 #define HAVE_STRUCT_DIRENT_D_TYPE 1
 #define HAVE_STRUCT_STATFS_F_FLAGS 1
 /* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
@@ -44,9 +71,12 @@
 /* #undef HAVE_SYS_NDIR_H */
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_STATFS_H 1
+#define HAVE_SYS_STATVFS_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_VFS_H 1
-#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1
-#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1
+#define HAVE_UNISTD_H 1
+#define HAVE_VPRINTF 1
 /* Can use #warning in C files */
 #define HAVE_WARNING_CPP_DIRECTIVE 1
 /* #undef HAVE_XMLPARSE_H */
@@ -56,10 +86,10 @@
 #define PACKAGE "fontconfig"
 #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
 #define PACKAGE_NAME "fontconfig"
-#define PACKAGE_STRING "fontconfig 2.12.6"
+#define PACKAGE_STRING "fontconfig 2.13.0"
 #define PACKAGE_TARNAME "fontconfig"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "2.12.6"
+#define PACKAGE_VERSION "2.13.0"
 /* #undef PTHREAD_CREATE_JOINABLE */
 /* #undef SIZEOF_CHAR */
 /* #undef SIZEOF_INT */
@@ -67,6 +97,7 @@
 /* #undef SIZEOF_SHORT */
 /* #undef SIZEOF_VOIDP */
 #define SIZEOF_VOID_P 8
+#define STDC_HEADERS 1
 #define USE_ICONV 0
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
@@ -83,7 +114,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "2.12.6"
+#define VERSION "2.13.0"
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua
index 7d1ec46d..8b513f3c 100644
--- a/pkg/fontconfig/gen.lua
+++ b/pkg/fontconfig/gen.lua
@@ -1,16 +1,17 @@
 cflags{
 	'-D HAVE_CONFIG_H',
-	'-I include',
 	'-I $dir',
 	'-I $outdir',
 	'-I $srcdir',
 	'-I pkg/freetype/src/include',
 	'-I $builddir/pkg/expat/include',
+	'-I $builddir/pkg/util-linux/include',
 }
 
 pkg.deps = {
 	'pkg/expat/headers',
 	'pkg/freetype/fetch',
+	'pkg/util-linux/headers',
 }
 
 rule('makealias', '$srcdir/src/makealias $srcdir/src $out $in')
@@ -30,7 +31,6 @@ makealias('fcftalias', 'fontconfig/fcfreetype.h')
 lib('libfontconfig.a', [[
 	src/(
 		fcatomic.c
-		fcblanks.c
 		fccache.c
 		fccfg.c
 		fccharset.c
@@ -41,6 +41,8 @@ lib('libfontconfig.a', [[
 		fcformat.c
 		fcfreetype.c
 		fcfs.c
+		fcptrlist.c
+		fchash.c
 		fcinit.c
 		fclang.c
 		fclist.c
@@ -60,6 +62,7 @@ lib('libfontconfig.a', [[
 	$builddir/pkg/(
 		expat/libexpat.a.d
 		freetype/libfreetype.a.d
+		util-linux/libuuid.a.d
 	)
 ]])
 
diff --git a/pkg/fontconfig/rev b/pkg/fontconfig/rev
index 7ed6ff82..1e8b3149 100644
--- a/pkg/fontconfig/rev
+++ b/pkg/fontconfig/rev
@@ -1 +1 @@
-5
+6
diff --git a/pkg/fontconfig/sha256 b/pkg/fontconfig/sha256
index 36f49d57..98058928 100644
--- a/pkg/fontconfig/sha256
+++ b/pkg/fontconfig/sha256
@@ -1 +1 @@
-064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334  fontconfig-2.12.6.tar.gz
+a6ca290637d8b2c4e1dd40549b179202977593f7481ec83ddfb1765ad90037ba  fontconfig-2.13.0.tar.gz
diff --git a/pkg/fontconfig/url b/pkg/fontconfig/url
index 10c08562..a7fa357c 100644
--- a/pkg/fontconfig/url
+++ b/pkg/fontconfig/url
@@ -1 +1 @@
-url = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.6.tar.gz"
+url = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.0.tar.gz"