Update to fontconfig 2.12.4. No API change.

4 files changed, 9 insertions, 15 deletions

diff --git a/lib/fontconfig/common/config.h b/lib/fontconfig/common/config.h
index c75778a92..291b49f99 100644
--- a/lib/fontconfig/common/config.h
+++ b/lib/fontconfig/common/config.h
@@ -25,6 +25,9 @@
 /* System font directory */
 #define FC_DEFAULT_FONTS "/usr/X11R6/lib/X11/fonts"
 
+/* The type of len parameter of the gperf hash/lookup function */
+#define FC_GPERF_SIZE_T unsigned int
+
 /* 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
@@ -254,7 +257,7 @@
 #define PACKAGE_NAME "fontconfig"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.12.1"
+#define PACKAGE_STRING "fontconfig 2.12.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fontconfig"
@@ -263,7 +266,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.12.1"
+#define PACKAGE_VERSION "2.12.4"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -320,7 +323,7 @@
 
 
 /* Version number of package */
-#define VERSION "2.12.1"
+#define VERSION "2.12.4"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/lib/fontconfig/pc/Makefile b/lib/fontconfig/pc/Makefile
index d0d332a04..565bf6ab6 100644
--- a/lib/fontconfig/pc/Makefile
+++ b/lib/fontconfig/pc/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 2016/10/08 14:09:10 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.4 2017/08/19 10:11:19 matthieu Exp $
 
 FONTCONFIG =	${.CURDIR}/../../../dist/fontconfig
 
 PKGCONFIG = fontconfig.pc
 
-PACKAGE_VERSION = 2.12.1
+PACKAGE_VERSION = 2.12.4
 PACKAGE = fontconfig
 VERSION = $(PACKAGE_VERSION)
 
diff --git a/lib/fontconfig/src/fcobjshash.h b/lib/fontconfig/src/fcobjshash.h
index 5a4d1ea03..4e66bb0a2 100644
--- a/lib/fontconfig/src/fcobjshash.h
+++ b/lib/fontconfig/src/fcobjshash.h
@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char *str, register unsigned int len)
       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
       {-1},
 #line 47 "fcobjshash.gperf"
-      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
 #line 48 "fcobjshash.gperf"
       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
 #line 55 "fcobjshash.gperf"
diff --git a/lib/fontconfig/src/fcstdint.h b/lib/fontconfig/src/fcstdint.h
deleted file mode 100644
index ff8e64729..000000000
--- a/lib/fontconfig/src/fcstdint.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _FONTCONFIG_SRC_FCSTDINT_H
-#define _FONTCONFIG_SRC_FCSTDINT_H 1
-#ifndef _GENERATED_STDINT_H
-#define _GENERATED_STDINT_H "fontconfig 2.12.1"
-/* generated using gnu compiler gcc (GCC) 6.1.1 20160621 (Red Hat 6.1.1-3) */
-#define _STDINT_HAVE_STDINT_H 1
-#include <stdint.h>
-#endif
-#endif