Sun Mar 11 17:54:03 2018 UTC ()
fontconfig: update to 2.13.0.

Finally we have made new stable release, 2.13.0 here. summaries for
changes since last stable release of 2.12.6 are:
- Improve the footprint on cache creation
- emoji/math fonts support
- variable fonts support
- config file description support
- allow sharing caches with bind-mounted dirs
- bug fixes


(wiz)
diff -r1.103 -r1.104 pkgsrc/fonts/fontconfig/Makefile
diff -r1.62 -r1.63 pkgsrc/fonts/fontconfig/distinfo
diff -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c
diff -r1.2 -r1.3 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h
cvs diff -r1.103 -r1.104 pkgsrc/fonts/fontconfig/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/Makefile 2018/01/15 08:59:15 1.103
+++ pkgsrc/fonts/fontconfig/Makefile 2018/03/11 17:54:03 1.104
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.103 2018/01/15 08:59:15 he Exp $ 1# $NetBSD: Makefile,v 1.104 2018/03/11 17:54:03 wiz Exp $
2 2
3DISTNAME= fontconfig-2.12.6 3DISTNAME= fontconfig-2.13.0
4PKGREVISION= 1 
5CATEGORIES= fonts 4CATEGORIES= fonts
6MASTER_SITES= https://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= https://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
14# https://bugs.freedesktop.org/show_bug.cgi?id=101280 13# https://bugs.freedesktop.org/show_bug.cgi?id=101280
15BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 14BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
16 15
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
cvs diff -r1.62 -r1.63 pkgsrc/fonts/fontconfig/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/distinfo 2018/01/15 08:59:15 1.62
+++ pkgsrc/fonts/fontconfig/distinfo 2018/03/11 17:54:03 1.63
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.62 2018/01/15 08:59:15 he Exp $ 1$NetBSD: distinfo,v 1.63 2018/03/11 17:54:03 wiz Exp $
2 2
3SHA1 (fontconfig-2.12.6.tar.bz2) = cae963814ba4bc41f3c96876604d33fc3abfc572 3SHA1 (fontconfig-2.13.0.tar.bz2) = b7bcc5d47211b7bbac35bb221860407db3601f5b
4RMD160 (fontconfig-2.12.6.tar.bz2) = d6e7a5c0dbd658b39701fda897414640d032cdb1 4RMD160 (fontconfig-2.13.0.tar.bz2) = cbc9a9b34f10b72e09d425557b156cf46c675a05
5SHA512 (fontconfig-2.12.6.tar.bz2) = 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06 5SHA512 (fontconfig-2.13.0.tar.bz2) = f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
6Size (fontconfig-2.12.6.tar.bz2) = 1624683 bytes 6Size (fontconfig-2.13.0.tar.bz2) = 1700500 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_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a 12SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
13SHA1 (patch-src_fcfreetype.c) = d162a814be3fa907c94c5a548e6af438052c5642 13SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e
14SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff 14SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
15SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf 15SHA1 (patch-src_fcint.h) = 0f8accec35b75ad4cd4c558f9680d1f82548a308
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
cvs diff -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/Attic/patch-src_fcfreetype.c (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/patches/Attic/patch-src_fcfreetype.c 2018/01/15 08:59:15 1.1
+++ pkgsrc/fonts/fontconfig/patches/Attic/patch-src_fcfreetype.c 2018/03/11 17:54:03 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-src_fcfreetype.c,v 1.1 2018/01/15 08:59:15 he Exp $ 1$NetBSD: patch-src_fcfreetype.c,v 1.2 2018/03/11 17:54:03 wiz Exp $
2 2
3Workaround for in-tree freetype2 headers from netbsd-6. 3Workaround for in-tree freetype2 headers from netbsd-6.
4 4
5--- src/fcfreetype.c.orig 2017-09-21 07:53:35.000000000 +0000 5--- src/fcfreetype.c.orig 2018-03-02 04:27:09.000000000 +0000
6+++ src/fcfreetype.c 6+++ src/fcfreetype.c
7@@ -1267,6 +1267,9 @@ FcFreeTypeQueryFace (const FT_Face face 7@@ -1338,6 +1338,9 @@ FcFreeTypeQueryFaceInternal (const FT_Fa
8 } 8 if (!FcPatternAddBool (pat, FC_VARIABLE, variable))
9 } 9 goto bail1;
10  10
11+#if !defined(FT_SFNT_OS2) && !defined(ft_sfnt_os2) 11+#if !defined(FT_SFNT_OS2) && !defined(ft_sfnt_os2)
12+# define FT_SFNT_OS2 ft_sfnt_os2 12+# define FT_SFNT_OS2 ft_sfnt_os2
13+#endif 13+#endif
14 /* 14 /*
15 * Get the OS/2 table 15 * Get the OS/2 table
16 */ 16 */
cvs diff -r1.2 -r1.3 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h 2017/06/20 11:36:40 1.2
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h 2018/03/11 17:54:03 1.3
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: patch-src_fcint.h,v 1.2 2017/06/20 11:36:40 wiz Exp $ 1$NetBSD: patch-src_fcint.h,v 1.3 2018/03/11 17:54:03 wiz Exp $
2 2
3--- src/fcint.h.orig 2017-03-01 02:27:14.000000000 +0000 3--- src/fcint.h.orig 2018-02-04 10:20:56.000000000 +0000
4+++ src/fcint.h 4+++ src/fcint.h
5@@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP 5@@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
6 #define FC_PATH_MAX 128 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@@ -104,7 +115,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP 23@@ -103,7 +114,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
24 #define FC_ABS(a) ((a) < 0 ? -(a) : (a)) 24 #define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
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
37 #include "fcalias.h" 37 #include "fcalias.h"