From 32a974d4af9de9c3850f8bef5fc1dd6bedeb3a60 Mon Sep 17 00:00:00 2001 From: recht Date: Thu, 18 Dec 2003 15:07:00 +0000 Subject: Fix build after freetype2 update --- fonts/fontconfig/Makefile | 4 ++-- fonts/fontconfig/distinfo | 6 ++++-- fonts/fontconfig/patches/patch-aa | 4 ++-- fonts/fontconfig/patches/patch-ab | 14 ++++++++++++++ fonts/fontconfig/patches/patch-ac | 14 ++++++++++++++ 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 fonts/fontconfig/patches/patch-ab create mode 100644 fonts/fontconfig/patches/patch-ac diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index cc042ce4f02..fb7ed22b32a 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2003/12/04 23:28:10 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.20 2003/12/18 15:07:00 recht Exp $ # DISTNAME= fontconfig-2.2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= fonts gnome MASTER_SITES= http://fontconfig.org/release/ diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 15bbea56c67..4080ca96af2 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/08/31 19:19:12 wiz Exp $ +$NetBSD: distinfo,v 1.4 2003/12/18 15:07:00 recht Exp $ SHA1 (fontconfig-2.2.1.tar.gz) = 1ba5a531cdc8df9f53c89e7de9241728628a6ab5 Size (fontconfig-2.2.1.tar.gz) = 613391 bytes -SHA1 (patch-aa) = 9b2650c41e694d77202ddb99c33de117f77b8f6d +SHA1 (patch-aa) = ce3c55333418ef22612688591e37eea7f3f8fb9c +SHA1 (patch-ab) = 5a966294381e759ebb470a44e458804f70d9a786 +SHA1 (patch-ac) = d138c542f46eff281706166b20b5c48fa0e77ea7 diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index a6fbb4dd044..0ee9d6674d3 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2003/08/31 19:19:13 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2003/12/18 15:07:00 recht Exp $ ---- Makefile.in.orig Sun Aug 31 18:53:15 2003 +--- Makefile.in.orig 2003-06-09 20:40:48.000000000 +0200 +++ Makefile.in @@ -201,14 +201,14 @@ fontconfig-zip: $(top_builddir)/config.s diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab new file mode 100644 index 00000000000..1f797ea9e2a --- /dev/null +++ b/fonts/fontconfig/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.3 2003/12/18 15:07:00 recht Exp $ + +--- fontconfig/fcfreetype.h.orig 2003-12-18 15:36:07.000000000 +0100 ++++ fontconfig/fcfreetype.h +@@ -24,7 +24,8 @@ + + #ifndef _FCFREETYPE_H_ + #define _FCFREETYPE_H_ +-#include ++#include ++#include FT_FREETYPE_H + + FT_UInt + FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4); diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac new file mode 100644 index 00000000000..29d3722c40d --- /dev/null +++ b/fonts/fontconfig/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.3 2003/12/18 15:07:00 recht Exp $ + +--- src/fcfreetype.c.orig 2003-12-18 15:55:56.000000000 +0100 ++++ src/fcfreetype.c +@@ -56,8 +56,8 @@ + #include + + #if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 4)) ++#include + #include +-#include + #define USE_FTBDF + #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ + (f)->driver->root.clazz->get_interface) -- cgit v1.2.3