CVS commit: pkgsrc/fonts/fontconfig

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 11 17:54:03 UTC 2018

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
        pkgsrc/fonts/fontconfig/patches: patch-src_fcfreetype.c
            patch-src_fcint.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.103 pkgsrc/fonts/fontconfig/Makefile:1.104
--- pkgsrc/fonts/fontconfig/Makefile:1.103      Mon Jan 15 08:59:15 2018
+++ pkgsrc/fonts/fontconfig/Makefile    Sun Mar 11 17:54:03 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2018/01/15 08:59:15 he Exp $
+# $NetBSD: Makefile,v 1.104 2018/03/11 17:54:03 wiz Exp $
 
-DISTNAME=      fontconfig-2.12.6
-PKGREVISION=   1
+DISTNAME=      fontconfig-2.13.0
 CATEGORIES=    fonts
 MASTER_SITES=  https://www.fontconfig.org/release/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.62 pkgsrc/fonts/fontconfig/distinfo:1.63
--- pkgsrc/fonts/fontconfig/distinfo:1.62       Mon Jan 15 08:59:15 2018
+++ pkgsrc/fonts/fontconfig/distinfo    Sun Mar 11 17:54:03 2018
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.62 2018/01/15 08:59:15 he Exp $
+$NetBSD: distinfo,v 1.63 2018/03/11 17:54:03 wiz Exp $
 
-SHA1 (fontconfig-2.12.6.tar.bz2) = cae963814ba4bc41f3c96876604d33fc3abfc572
-RMD160 (fontconfig-2.12.6.tar.bz2) = d6e7a5c0dbd658b39701fda897414640d032cdb1
-SHA512 (fontconfig-2.12.6.tar.bz2) = 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-Size (fontconfig-2.12.6.tar.bz2) = 1624683 bytes
+SHA1 (fontconfig-2.13.0.tar.bz2) = b7bcc5d47211b7bbac35bb221860407db3601f5b
+RMD160 (fontconfig-2.13.0.tar.bz2) = cbc9a9b34f10b72e09d425557b156cf46c675a05
+SHA512 (fontconfig-2.13.0.tar.bz2) = f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
+Size (fontconfig-2.13.0.tar.bz2) = 1700500 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_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
-SHA1 (patch-src_fcfreetype.c) = d162a814be3fa907c94c5a548e6af438052c5642
+SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
-SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf
+SHA1 (patch-src_fcint.h) = 0f8accec35b75ad4cd4c558f9680d1f82548a308
 SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
 SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c:1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c:1.1  Mon Jan 15 08:59:15 2018
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c      Sun Mar 11 17:54:03 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_fcfreetype.c,v 1.1 2018/01/15 08:59:15 he Exp $
+$NetBSD: patch-src_fcfreetype.c,v 1.2 2018/03/11 17:54:03 wiz Exp $
 
 Workaround for in-tree freetype2 headers from netbsd-6.
 
---- src/fcfreetype.c.orig      2017-09-21 07:53:35.000000000 +0000
+--- src/fcfreetype.c.orig      2018-03-02 04:27:09.000000000 +0000
 +++ src/fcfreetype.c
-@@ -1267,6 +1267,9 @@ FcFreeTypeQueryFace (const FT_Face  face
-       }
-     }
+@@ -1338,6 +1338,9 @@ FcFreeTypeQueryFaceInternal (const FT_Fa
+     if (!FcPatternAddBool (pat, FC_VARIABLE, variable))
+       goto bail1;
  
 +#if !defined(FT_SFNT_OS2) && !defined(ft_sfnt_os2)
 +# define FT_SFNT_OS2 ft_sfnt_os2

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.3
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.2       Tue Jun 20 11:36:40 2017
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h   Sun Mar 11 17:54:03 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_fcint.h,v 1.2 2017/06/20 11:36:40 wiz Exp $
+$NetBSD: patch-src_fcint.h,v 1.3 2018/03/11 17:54:03 wiz Exp $
 
---- src/fcint.h.orig   2017-03-01 02:27:14.000000000 +0000
+--- src/fcint.h.orig   2018-02-04 10:20:56.000000000 +0000
 +++ src/fcint.h
 @@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
  #define FC_PATH_MAX   128
@@ -20,8 +20,8 @@ $NetBSD: patch-src_fcint.h,v 1.2 2017/06
  #if __GNUC__ >= 4
  #define FC_UNUSED     __attribute__((unused))
  #else
-@@ -104,7 +115,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
- #define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
+@@ -103,7 +114,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
+ #define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
  
  /* slim_internal.h */
 -#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)