summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2007-01-30 16:42:21 +0000
committertv <tv@pkgsrc.org>2007-01-30 16:42:21 +0000
commit9bbfee387f3dce7b39224d48d2847967a53dec86 (patch)
tree7bfa1a32fa8b3714afcc204b7b9245c2e7cbbafd
parented0cc7bbba80dbfe1c651aafa55791d17bf0635c (diff)
downloadpkgsrc-9bbfee387f3dce7b39224d48d2847967a53dec86.tar.gz
De-GNUify grep expression in makealias ("\>" is not portable).
Add Interix intptr definitions to internal .h.
-rw-r--r--fonts/fontconfig/distinfo5
-rw-r--r--fonts/fontconfig/patches/patch-ab13
-rw-r--r--fonts/fontconfig/patches/patch-ae35
3 files changed, 44 insertions, 9 deletions
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 1ef21377bdc..587f0aeeb4d 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2006/12/04 12:41:51 wiz Exp $
+$NetBSD: distinfo,v 1.24 2007/01/30 16:42:21 tv Exp $
SHA1 (fontconfig-2.4.2.tar.gz) = cd5e30625680a0435563b586275156eaf8d0d34a
RMD160 (fontconfig-2.4.2.tar.gz) = c953020a5193500080c9eceef47b76e61c41b188
Size (fontconfig-2.4.2.tar.gz) = 1278340 bytes
SHA1 (patch-aa) = 7aa7831ccc818d0f501df941a1d12f3ed610d33b
+SHA1 (patch-ab) = 455e20719e7ad300ebe95748165eeb7e25897dd5
SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93
-SHA1 (patch-ae) = 9b74310ddd2986390f48b0622a0225c29d6372e2
+SHA1 (patch-ae) = a9d8acd0e057c3306a6da0716cbb1194d67f0502
diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab
new file mode 100644
index 00000000000..daea12742db
--- /dev/null
+++ b/fonts/fontconfig/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2007/01/30 16:42:21 tv Exp $
+
+--- src/makealias.orig 2006-12-02 16:11:26.000000000 -0500
++++ src/makealias
+@@ -15,7 +15,7 @@ while read name; do
+ hattr='__attribute((visibility("hidden")))'
+ echo "extern __typeof ($name) $alias $hattr;" >> $HEAD
+ echo "#define $name $alias" >> $HEAD
+- grep -l '^'$name'\>' "$SRCDIR"/*.c | head -1 | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL
++ grep -l '^'$name'[^A-Za-z0-9_]' "$SRCDIR"/*.c | head -1 | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL
+ echo "#undef $name" >> $TAIL
+ cattr='__attribute((alias("'$alias'"), visibility("default")))'
+ echo "extern __typeof ($name) $name $cattr;" >> $TAIL
diff --git a/fonts/fontconfig/patches/patch-ae b/fonts/fontconfig/patches/patch-ae
index 6ee9db29549..7b0d74a4bec 100644
--- a/fonts/fontconfig/patches/patch-ae
+++ b/fonts/fontconfig/patches/patch-ae
@@ -1,17 +1,30 @@
-$NetBSD: patch-ae,v 1.5 2006/11/28 16:15:30 tv Exp $
+$NetBSD: patch-ae,v 1.6 2007/01/30 16:42:21 tv Exp $
---- src/fcint.h.orig 2006-09-15 03:06:40.000000000 -0400
+--- src/fcint.h.orig 2006-12-02 16:52:09.000000000 -0500
+++ src/fcint.h
-@@ -35,7 +35,7 @@
+@@ -35,6 +35,21 @@
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
#include <stdint.h>
--#else
-+#elif !defined(__INTERIX)
++#elif defined(__INTERIX)
++
++/* limits.h has a definition for ALIGN() that conflicts with the one below */
++# include <limits.h>
++# undef ALIGN
++/* Interix 3.x has a gcc that shadows this. */
++# ifndef _INTPTR_T_DEFINED
++ typedef long intptr_t;
++# define _INTPTR_T_DEFINED
++# endif
++# ifndef _UINTPTR_T_DEFINED
++ typedef unsigned long uintptr_t;
++# define _UINTPTR_T_DEFINED
++# endif
++
+ #else
#error missing C99 integer data types
#endif
- #include <string.h>
-@@ -111,7 +111,7 @@
+@@ -111,7 +126,7 @@
#define FC_BANK_LANGS 0xfcfcfcfc
/* slim_internal.h */
@@ -20,3 +33,11 @@ $NetBSD: patch-ae,v 1.5 2006/11/28 16:15:30 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 */