CVS commit: [pkgsrc-2017Q4] pkgsrc/fonts/fontconfig

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Fri Jan 19 20:25:02 UTC 2018

Modified Files:
        pkgsrc/fonts/fontconfig [pkgsrc-2017Q4]: Makefile distinfo
Added Files:
        pkgsrc/fonts/fontconfig/patches [pkgsrc-2017Q4]: patch-src_fcfreetype.c

Log Message:
Pullup ticket #5681 - requested by he
fonts/fontconfig: build fix

Revisions pulled up:
- fonts/fontconfig/Makefile                                     1.103
- fonts/fontconfig/distinfo                                     1.62
- fonts/fontconfig/patches/patch-src_fcfreetype.c               1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        he
   Date:                Mon Jan 15 08:59:15 UTC 2018

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

   Log Message:
   Add a workaround for the Old in-tree fontconfig headers
   on netbsd-6 (build fix).
   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.102 -r1.103 pkgsrc/fonts/fontconfig/Makefile
   cvs rdiff -u -r1.61 -r1.62 pkgsrc/fonts/fontconfig/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.102.2.1 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.61 -r1.61.2.1 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c

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.102 pkgsrc/fonts/fontconfig/Makefile:1.102.2.1
--- pkgsrc/fonts/fontconfig/Makefile:1.102      Mon Oct  2 14:42:44 2017
+++ pkgsrc/fonts/fontconfig/Makefile    Fri Jan 19 20:25:01 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2017/10/02 14:42:44 wiz Exp $
+# $NetBSD: Makefile,v 1.102.2.1 2018/01/19 20:25:01 spz Exp $
 
 DISTNAME=      fontconfig-2.12.6
+PKGREVISION=   1
 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.61 pkgsrc/fonts/fontconfig/distinfo:1.61.2.1
--- pkgsrc/fonts/fontconfig/distinfo:1.61       Mon Oct  2 14:42:44 2017
+++ pkgsrc/fonts/fontconfig/distinfo    Fri Jan 19 20:25:01 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2017/10/02 14:42:44 wiz Exp $
+$NetBSD: distinfo,v 1.61.2.1 2018/01/19 20:25:01 spz Exp $
 
 SHA1 (fontconfig-2.12.6.tar.bz2) = cae963814ba4bc41f3c96876604d33fc3abfc572
 RMD160 (fontconfig-2.12.6.tar.bz2) = d6e7a5c0dbd658b39701fda897414640d032cdb1
@@ -10,6 +10,7 @@ SHA1 (patch-af) = d351265c894738284215f0
 SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
+SHA1 (patch-src_fcfreetype.c) = d162a814be3fa907c94c5a548e6af438052c5642
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
 SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf
 SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9

Added files:

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c
diff -u /dev/null pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c:1.1.2.2
--- /dev/null   Fri Jan 19 20:25:02 2018
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c      Fri Jan 19 20:25:02 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_fcfreetype.c,v 1.1.2.2 2018/01/19 20:25:02 spz 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
+@@ -1267,6 +1267,9 @@ FcFreeTypeQueryFace (const FT_Face  face
+       }
+     }
+ 
++#if !defined(FT_SFNT_OS2) && !defined(ft_sfnt_os2)
++# define FT_SFNT_OS2 ft_sfnt_os2
++#endif
+     /*
+      * Get the OS/2 table
+      */