diff options
| author | he <he@pkgsrc.org> | 2018-01-15 08:59:15 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2018-01-15 08:59:15 +0000 |
| commit | 3780748831414b1efd5586e4ce151577d7ffa6fe (patch) | |
| tree | ea65cc56c7ce14175ea3995bf8e4e9c6edc01548 /fonts | |
| parent | c1bc0fff13991070a68dbf946662e5871bb25f50 (diff) | |
| download | pkgsrc-3780748831414b1efd5586e4ce151577d7ffa6fe.tar.gz | |
Add a workaround for the Old in-tree fontconfig headers
on netbsd-6 (build fix).
Bump PKGREVISION.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/fontconfig/Makefile | 3 | ||||
| -rw-r--r-- | fonts/fontconfig/distinfo | 3 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-src_fcfreetype.c | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 183e4d40ac8..ce956e06ca8 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.102 2017/10/02 14:42:44 wiz Exp $ +# $NetBSD: Makefile,v 1.103 2018/01/15 08:59:15 he Exp $ DISTNAME= fontconfig-2.12.6 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= https://www.fontconfig.org/release/ EXTRACT_SUFX= .tar.bz2 diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index f34ba6f4e18..b29120b2494 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2017/10/02 14:42:44 wiz Exp $ +$NetBSD: distinfo,v 1.62 2018/01/15 08:59:15 he Exp $ SHA1 (fontconfig-2.12.6.tar.bz2) = cae963814ba4bc41f3c96876604d33fc3abfc572 RMD160 (fontconfig-2.12.6.tar.bz2) = d6e7a5c0dbd658b39701fda897414640d032cdb1 @@ -10,6 +10,7 @@ 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_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff SHA1 (patch-src_fcint.h) = 106da6fabdf1d90f6e943c2e6144657ddf65e9bf SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9 diff --git a/fonts/fontconfig/patches/patch-src_fcfreetype.c b/fonts/fontconfig/patches/patch-src_fcfreetype.c new file mode 100644 index 00000000000..abd6f0ed15e --- /dev/null +++ b/fonts/fontconfig/patches/patch-src_fcfreetype.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_fcfreetype.c,v 1.1 2018/01/15 08:59:15 he 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 + */ |