Updated fontconfig to 2.12.3.

2.12.3

Akira TAGOH (1):
      Fix make check fail with freetype-2.7.1 and 2.8 with PCF_CONFIG_OPTION_LONG_FAMILY_NAMES enabled.

2.12.2

Akira TAGOH (8):
      Don't call perror() if no changes happens in errno
      Fix FcCacheOffsetsValid()
      Fix the build issue with gperf 3.1
      Fix the build issue on GNU/Hurd
      Update a bit for the changes in FreeType 2.7.1
      Add the description of FC_LANG envvar to the doc
      Bug 101202 - fontconfig FTBFS if docbook-utils is installed
      Update libtool revision

Alan Coopersmith (1):
      Correct cache version info in doc/fontconfig-user.sgml

Khem Raj (1):
      Avoid conflicts with integer width macros from TS 18661-1:2014

Masamichi Hosoda (2):
      Fix PostScript font alias name
      Update aliases for URW June 2016

5 files changed, 40 insertions, 54 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 55e3c3dd4db..7eaa704530c 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.98 2017/05/30 16:53:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.99 2017/06/20 11:36:40 wiz Exp $
 
-DISTNAME=	fontconfig-2.12.1
-PKGREVISION=	1
+DISTNAME=	fontconfig-2.12.3
 CATEGORIES=	fonts
-MASTER_SITES=	http://www.fontconfig.org/release/
+MASTER_SITES=	https://www.fontconfig.org/release/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fontconfig.org/
+HOMEPAGE=	https://www.fontconfig.org/
 COMMENT=	Library for configuring and customizing font access
 #LICENSE=	x11?
 
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 8705130738a..5c284d0eecf 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.56 2017/05/30 16:53:14 jperkin Exp $
+$NetBSD: distinfo,v 1.57 2017/06/20 11:36:40 wiz Exp $
 
-SHA1 (fontconfig-2.12.1.tar.bz2) = 30d832b754fb10a3b70ebac750a38a0275438ad8
-RMD160 (fontconfig-2.12.1.tar.bz2) = 66907dbb317309bcb5013ea45c53dbf5050e6376
-SHA512 (fontconfig-2.12.1.tar.bz2) = a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e
-Size (fontconfig-2.12.1.tar.bz2) = 1608901 bytes
+SHA1 (fontconfig-2.12.3.tar.bz2) = 408f933548bdc9ad912bc66d0fba22a8a4612d8b
+RMD160 (fontconfig-2.12.3.tar.bz2) = b8538f7f6865747ff09016a6a1b908c740485d50
+SHA512 (fontconfig-2.12.3.tar.bz2) = 311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7
+Size (fontconfig-2.12.3.tar.bz2) = 1600509 bytes
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
 SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
-SHA1 (patch-src_fccache.c) = 5215a9ae314625f1f088011cb0a5f085d963ee83
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
-SHA1 (patch-src_fcint.h) = 13602cc605d7dadd2f7c30633236454bb134a50a
+SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf
+SHA1 (patch-src_fcobjshash.h) = 1a25e0ba6cfef88c579ef69f9fbd0d49f2254efa
 SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
 SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09
diff --git a/fonts/fontconfig/patches/patch-src_fccache.c b/fonts/fontconfig/patches/patch-src_fccache.c
deleted file mode 100644
index f6594cad65f..00000000000
--- a/fonts/fontconfig/patches/patch-src_fccache.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_fccache.c,v 1.1 2017/05/30 16:53:14 jperkin Exp $
-
-Apply upstream patch for https://bugs.freedesktop.org/show_bug.cgi?id=97546
-
---- src/fccache.c.orig	2016-08-05 05:35:05.000000000 +0000
-+++ src/fccache.c
-@@ -640,6 +640,7 @@ FcCacheOffsetsValid (FcCache *cache)
-             FcPattern		*font = FcFontSetFont (fs, i);
-             FcPatternElt	*e;
-             FcValueListPtr	 l;
-+	    char                *last_offset;
- 
-             if ((char *) font < base ||
-                 (char *) font > end - sizeof (FcFontSet) ||
-@@ -653,11 +654,17 @@ FcCacheOffsetsValid (FcCache *cache)
-             if (e->values != 0 && !FcIsEncodedOffset(e->values))
-                 return FcFalse;
- 
--            for (j = font->num, l = FcPatternEltValues(e); j >= 0 && l; j--, l = FcValueListNext(l))
--                if (l->next != NULL && !FcIsEncodedOffset(l->next))
--                    break;
--            if (j < 0)
--                return FcFalse;
-+	    for (j = 0; j < font->num; j++)
-+	    {
-+		last_offset = (char *) font + font->elts_offset;
-+		for (l = FcPatternEltValues(&e[j]); l; l = FcValueListNext(l))
-+		{
-+		    if ((char *) l < last_offset || (char *) l > end - sizeof (*l) ||
-+			(l->next != NULL && !FcIsEncodedOffset(l->next)))
-+			return FcFalse;
-+		    last_offset = (char *) l + 1;
-+		}
-+	    }
-         }
-     }
- 
diff --git a/fonts/fontconfig/patches/patch-src_fcint.h b/fonts/fontconfig/patches/patch-src_fcint.h
index 4209a500c1c..aae9f1cf946 100644
--- a/fonts/fontconfig/patches/patch-src_fcint.h
+++ b/fonts/fontconfig/patches/patch-src_fcint.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_fcint.h,v 1.1 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-src_fcint.h,v 1.2 2017/06/20 11:36:40 wiz Exp $
 
---- src/fcint.h.orig	2014-01-20 08:14:20.000000000 +0000
+--- src/fcint.h.orig	2017-03-01 02:27:14.000000000 +0000
 +++ src/fcint.h
-@@ -68,6 +68,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
- #  define FC_DIR_SEPARATOR_S       "/"
+@@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
+ #define FC_PATH_MAX	128
  #endif
  
 +/*
@@ -20,7 +20,7 @@ $NetBSD: patch-src_fcint.h,v 1.1 2014/07/15 14:48:34 ryoon Exp $
  #if __GNUC__ >= 4
  #define FC_UNUSED	__attribute__((unused))
  #else
-@@ -95,7 +106,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
+@@ -104,7 +115,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
  #define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
  
  /* slim_internal.h */
diff --git a/fonts/fontconfig/patches/patch-src_fcobjshash.h b/fonts/fontconfig/patches/patch-src_fcobjshash.h
new file mode 100644
index 00000000000..87e8720a499
--- /dev/null
+++ b/fonts/fontconfig/patches/patch-src_fcobjshash.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_fcobjshash.h,v 1.1 2017/06/20 11:36:40 wiz Exp $
+
+Fix signature for FC_GPERF_SIZE_T=size_t systems.
+
+--- src/fcobjshash.h.orig	2017-02-22 12:37:50.000000000 +0000
++++ src/fcobjshash.h
+@@ -47,7 +47,7 @@ inline
+ #endif
+ #endif
+ static unsigned int
+-FcObjectTypeHash (register const char *str, register unsigned int len)
++FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len)
+ {
+   static const unsigned char asso_values[] =
+     {
+@@ -191,7 +191,7 @@ __attribute__ ((__gnu_inline__))
+ #endif
+ #endif
+ const struct FcObjectTypeInfo *
+-FcObjectTypeLookup (register const char *str, register unsigned int len)
++FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len)
+ {
+   enum
+     {