From 5532a71736de03ff4f00f9581b35c2d323c9fe59 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 30 Jan 2007 17:03:50 +0000 Subject: Remove third patch hunk with the #undef; it's redundant. --- fonts/fontconfig/distinfo | 4 ++-- fonts/fontconfig/patches/patch-ae | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'fonts') diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 587f0aeeb4d..af4c5e53ee7 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2007/01/30 16:42:21 tv Exp $ +$NetBSD: distinfo,v 1.25 2007/01/30 17:03:50 tv Exp $ SHA1 (fontconfig-2.4.2.tar.gz) = cd5e30625680a0435563b586275156eaf8d0d34a RMD160 (fontconfig-2.4.2.tar.gz) = c953020a5193500080c9eceef47b76e61c41b188 @@ -6,4 +6,4 @@ Size (fontconfig-2.4.2.tar.gz) = 1278340 bytes SHA1 (patch-aa) = 7aa7831ccc818d0f501df941a1d12f3ed610d33b SHA1 (patch-ab) = 455e20719e7ad300ebe95748165eeb7e25897dd5 SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93 -SHA1 (patch-ae) = a9d8acd0e057c3306a6da0716cbb1194d67f0502 +SHA1 (patch-ae) = 9bd0bf5cdbdf9e1e075d248fd33a156cd4cde909 diff --git a/fonts/fontconfig/patches/patch-ae b/fonts/fontconfig/patches/patch-ae index 7b0d74a4bec..775c12a0133 100644 --- a/fonts/fontconfig/patches/patch-ae +++ b/fonts/fontconfig/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.6 2007/01/30 16:42:21 tv Exp $ +$NetBSD: patch-ae,v 1.7 2007/01/30 17:03:50 tv Exp $ --- src/fcint.h.orig 2006-12-02 16:52:09.000000000 -0500 +++ src/fcint.h @@ -33,11 +33,3 @@ $NetBSD: patch-ae,v 1.6 2007/01/30 16:42:21 tv Exp $ #define FcPrivate __attribute__((__visibility__("hidden"))) #define HAVE_GNUC_ATTRIBUTE 1 #include "fcalias.h" -@@ -493,6 +508,7 @@ typedef struct _FcFileTime { - typedef struct _FcCharMap FcCharMap; - - /* watch out; assumes that v is void * -PL */ -+#undef ALIGN - #define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1))) - - /* fcblanks.c */ -- cgit v1.2.3