Tue Jun 20 11:36:40 2017 UTC ()
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


(wiz)
diff -r1.98 -r1.99 pkgsrc/fonts/fontconfig/Makefile
diff -r1.56 -r1.57 pkgsrc/fonts/fontconfig/distinfo
diff -r1.1 -r0 pkgsrc/fonts/fontconfig/patches/patch-src_fccache.c
diff -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h
diff -r0 -r1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fcobjshash.h
cvs diff -r1.98 -r1.99 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2017/05/30 16:53:14 1.98
+++ pkgsrc/fonts/fontconfig/Makefile 2017/06/20 11:36:40 1.99
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.98 2017/05/30 16:53:14 jperkin Exp $ 1# $NetBSD: Makefile,v 1.99 2017/06/20 11:36:40 wiz Exp $
2 2
3DISTNAME= fontconfig-2.12.1 3DISTNAME= fontconfig-2.12.3
4PKGREVISION= 1 
5CATEGORIES= fonts 4CATEGORIES= fonts
6MASTER_SITES= http://www.fontconfig.org/release/ 5MASTER_SITES= https://www.fontconfig.org/release/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.fontconfig.org/ 9HOMEPAGE= https://www.fontconfig.org/
11COMMENT= Library for configuring and customizing font access 10COMMENT= Library for configuring and customizing font access
12#LICENSE= x11? 11#LICENSE= x11?
13 12
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/share/fonts/X11 16CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/share/fonts/X11
18CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include 17CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
19CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib 18CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
20CONFIGURE_ARGS+= --with-baseconfigdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --with-baseconfigdir=${PKG_SYSCONFDIR}
21CONFIGURE_ARGS+= --with-cache-dir=${VARBASE}/cache/fontconfig 20CONFIGURE_ARGS+= --with-cache-dir=${VARBASE}/cache/fontconfig
22CONFIGURE_ARGS+= --enable-docs 21CONFIGURE_ARGS+= --enable-docs
23CONFIGURE_ENV+= HASDOCBOOK=no 22CONFIGURE_ENV+= HASDOCBOOK=no
cvs diff -r1.56 -r1.57 pkgsrc/fonts/fontconfig/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/distinfo 2017/05/30 16:53:14 1.56
+++ pkgsrc/fonts/fontconfig/distinfo 2017/06/20 11:36:40 1.57
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.56 2017/05/30 16:53:14 jperkin Exp $ 1$NetBSD: distinfo,v 1.57 2017/06/20 11:36:40 wiz Exp $
2 2
3SHA1 (fontconfig-2.12.1.tar.bz2) = 30d832b754fb10a3b70ebac750a38a0275438ad8 3SHA1 (fontconfig-2.12.3.tar.bz2) = 408f933548bdc9ad912bc66d0fba22a8a4612d8b
4RMD160 (fontconfig-2.12.1.tar.bz2) = 66907dbb317309bcb5013ea45c53dbf5050e6376 4RMD160 (fontconfig-2.12.3.tar.bz2) = b8538f7f6865747ff09016a6a1b908c740485d50
5SHA512 (fontconfig-2.12.1.tar.bz2) = a5ba2c1a52272b39aad20394dcc85c202159af0d3d2c1b34b24cbdbc8babb3157005a79d25c21a9bf6ec0459681b1ab05af102b2c0594f485c49e3b3b531067e 5SHA512 (fontconfig-2.12.3.tar.bz2) = 311a3c98a05afbe35c1215b41edb2bbcfe3069f85814c882ef0e40f0404cca4bb59a544b14eee9430ea902fd8bc3bfeccb37e42b9fe3bb3a6c71bb0c5332f2c7
6Size (fontconfig-2.12.1.tar.bz2) = 1608901 bytes 6Size (fontconfig-2.12.3.tar.bz2) = 1600509 bytes
7SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12 7SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
8SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803 8SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7 9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
10SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e 10SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
11SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200 11SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
12SHA1 (patch-src_fccache.c) = 5215a9ae314625f1f088011cb0a5f085d963ee83 
13SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a 12SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
14SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff 13SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
15SHA1 (patch-src_fcint.h) = 13602cc605d7dadd2f7c30633236454bb134a50a 14SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf
 15SHA1 (patch-src_fcobjshash.h) = 1a25e0ba6cfef88c579ef69f9fbd0d49f2254efa
16SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9 16SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
17SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09 17SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09
File Deleted: pkgsrc/fonts/fontconfig/patches/Attic/patch-src_fccache.c
cvs diff -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h 2014/07/15 14:48:34 1.1
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h 2017/06/20 11:36:40 1.2
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-src_fcint.h,v 1.1 2014/07/15 14:48:34 ryoon Exp $ 1$NetBSD: patch-src_fcint.h,v 1.2 2017/06/20 11:36:40 wiz Exp $
2 2
3--- src/fcint.h.orig 2014-01-20 08:14:20.000000000 +0000 3--- src/fcint.h.orig 2017-03-01 02:27:14.000000000 +0000
4+++ src/fcint.h 4+++ src/fcint.h
5@@ -68,6 +68,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP 5@@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
6 # define FC_DIR_SEPARATOR_S "/" 6 #define FC_PATH_MAX 128
7 #endif 7 #endif
8  8
9+/* 9+/*
10+ * SCO OpenServer 5.0.7/3.2 has no MAXPATHLEN, but it has PATH_MAX (256). 10+ * SCO OpenServer 5.0.7/3.2 has no MAXPATHLEN, but it has PATH_MAX (256).
11+ * in limits.h. PATH_MAX is defined alternatively under non-OpenServer OS, 11+ * in limits.h. PATH_MAX is defined alternatively under non-OpenServer OS,
12+ * and it is used in dirname.c of bmake. 12+ * and it is used in dirname.c of bmake.
13+ */ 13+ */
14+#if !defined(PATH_MAX) 14+#if !defined(PATH_MAX)
15+#if defined(_SCO_DS) 15+#if defined(_SCO_DS)
16+#define PATH_MAX 1024 16+#define PATH_MAX 1024
17+#endif 17+#endif
18+#endif 18+#endif
19+ 19+
20 #if __GNUC__ >= 4 20 #if __GNUC__ >= 4
21 #define FC_UNUSED __attribute__((unused)) 21 #define FC_UNUSED __attribute__((unused))
22 #else 22 #else
23@@ -95,7 +106,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP 23@@ -104,7 +115,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
24 #define FC_ABS(a) ((a) < 0 ? -(a) : (a)) 24 #define FC_ABS(a) ((a) < 0 ? -(a) : (a))
25  25
26 /* slim_internal.h */ 26 /* slim_internal.h */
27-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) 27-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
28+/* Bug of GCC 4.2 (visibility and -fPIC) 28+/* Bug of GCC 4.2 (visibility and -fPIC)
29+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46861 */ 29+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46861 */
30+#if (__GNUC__ == 4 && __GNUC_MINOR__ == 2) && defined(__ELF__) && !defined(__sun) 30+#if (__GNUC__ == 4 && __GNUC_MINOR__ == 2) && defined(__ELF__) && !defined(__sun)
31+#define FcPrivate 31+#define FcPrivate
32+#define HAVE_GNUC_ATTRIBUTE 1 32+#define HAVE_GNUC_ATTRIBUTE 1
33+#include "fcalias.h" 33+#include "fcalias.h"
34+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2) 34+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
35 #define FcPrivate __attribute__((__visibility__("hidden"))) 35 #define FcPrivate __attribute__((__visibility__("hidden")))
36 #define HAVE_GNUC_ATTRIBUTE 1 36 #define HAVE_GNUC_ATTRIBUTE 1
File Added: pkgsrc/fonts/fontconfig/patches/Attic/patch-src_fcobjshash.h
$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
     {