diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2012-10-03 12:11:22 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2012-10-03 12:11:22 +0000 |
| commit | d1b415e788321ed8819ce1d582d34128333a3fd1 (patch) | |
| tree | a208c4195e416558f0255d9758674108ab9dc988 | |
| parent | baf87fb064ef4a978d42417a392afd9efd52f320 (diff) | |
| download | pkgsrc-d1b415e788321ed8819ce1d582d34128333a3fd1.tar.gz | |
Fix fontconfig build on MirBSD. I will try to get a more proper fix
integrated upstream. Everything in this patch is #ifdef __MirBSD__.
| -rw-r--r-- | fonts/fontconfig/distinfo | 3 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-src_fcstat.c | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 0797d5ed7a5..a121ee368ce 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2012/07/31 18:12:28 drochner Exp $ +$NetBSD: distinfo,v 1.36 2012/10/03 12:11:22 bsiegert Exp $ SHA1 (fontconfig-2.10.1.tar.gz) = e377cbe989cd22d3a10020309c906ecbbcac0043 RMD160 (fontconfig-2.10.1.tar.gz) = 5dab00198b010d6d9a2bc20864b24497f09745ce @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 71925f19d55a0daf382f4ac31c5010180173ae50 SHA1 (patch-ac) = c4f9904842c43246321cb982af78c1a61d06ad75 SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769 SHA1 (patch-af) = becdaa40180fd8aaa828faf3776ccd70d460e67e +SHA1 (patch-src_fcstat.c) = 2e8a5a7106f70a7bc1b5dd223600692c29eedb07 diff --git a/fonts/fontconfig/patches/patch-src_fcstat.c b/fonts/fontconfig/patches/patch-src_fcstat.c new file mode 100644 index 00000000000..9a27ad4a74a --- /dev/null +++ b/fonts/fontconfig/patches/patch-src_fcstat.c @@ -0,0 +1,42 @@ +$NetBSD: patch-src_fcstat.c,v 1.1 2012/10/03 12:11:22 bsiegert Exp $ + +The argument types to scandir(3) differ between different OSes. +OpenBSD seems to be still different. I used the provided alphasort +instead of rewriting the equivalent sorter function. +statvfs and fstatvfs need another include file, at least on MirBSD. +--- src/fcstat.c.orig Wed Sep 26 08:58:18 2012 ++++ src/fcstat.c +@@ -42,6 +42,9 @@ + #ifdef HAVE_SYS_MOUNT_H + #include <sys/mount.h> + #endif ++#ifdef __MirBSD__ ++#include <sys/statvfs.h> ++#endif + + #ifdef _WIN32 + +@@ -161,7 +164,11 @@ Adler32Finish (struct Adler32 *ctx) + #ifdef HAVE_STRUCT_DIRENT_D_TYPE + /* dirent.d_type can be relied upon on FAT filesystem */ + static FcBool ++# ifdef __MirBSD__ ++FcDirChecksumScandirFilter(struct dirent *entry) ++# else + FcDirChecksumScandirFilter(const struct dirent *entry) ++# endif + { + return entry->d_type != DT_DIR; + } +@@ -191,7 +198,11 @@ FcDirChecksum (const FcChar8 *dir, time_ + #else + NULL, + #endif ++#ifdef __MirBSD__ ++ &alphasort); ++#else + &FcDirChecksumScandirSorter); ++#endif + if (n == -1) + return -1; + |