Fri Jul 26 11:37:23 2013 UTC ()
Fix build under GNU/kFreeBSD.


(ryoon)
diff -r1.41 -r1.42 pkgsrc/fonts/fontconfig/distinfo
diff -r1.12 -r1.13 pkgsrc/fonts/fontconfig/patches/patch-ab

cvs diff -r1.41 -r1.42 pkgsrc/fonts/fontconfig/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/distinfo 2013/05/20 19:56:39 1.41
+++ pkgsrc/fonts/fontconfig/distinfo 2013/07/26 11:37:22 1.42
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.41 2013/05/20 19:56:39 adam Exp $ 1$NetBSD: distinfo,v 1.42 2013/07/26 11:37:22 ryoon Exp $
2 2
3SHA1 (fontconfig-2.10.93.tar.bz2) = 78a87be2a59b0c803bfd69cdafc85cbc31381d3a 3SHA1 (fontconfig-2.10.93.tar.bz2) = 78a87be2a59b0c803bfd69cdafc85cbc31381d3a
4RMD160 (fontconfig-2.10.93.tar.bz2) = 0427185e941f534c3e40dd3ae4abdd2ab72fac20 4RMD160 (fontconfig-2.10.93.tar.bz2) = 0427185e941f534c3e40dd3ae4abdd2ab72fac20
5Size (fontconfig-2.10.93.tar.bz2) = 1526089 bytes 5Size (fontconfig-2.10.93.tar.bz2) = 1526089 bytes
6SHA1 (patch-aa) = a0a752e7050ae438198b7286d01dbc5ab4a7e53e 6SHA1 (patch-aa) = a0a752e7050ae438198b7286d01dbc5ab4a7e53e
7SHA1 (patch-ab) = 04d21073e6e585c5317e5c29d2d1918d240ce233 7SHA1 (patch-ab) = 5aabb4bd60319c83cbb22f784efe11bdc7308f92
8SHA1 (patch-ac) = 7de7a672650286d2f72b95b9c96e19b5df2a9155 8SHA1 (patch-ac) = 7de7a672650286d2f72b95b9c96e19b5df2a9155
9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7 9SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
10SHA1 (patch-ba) = e4f116b777a8046615569ae6e89545ad3c7abf77 10SHA1 (patch-ba) = e4f116b777a8046615569ae6e89545ad3c7abf77
11SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7 11SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7

cvs diff -r1.12 -r1.13 pkgsrc/fonts/fontconfig/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/patches/Attic/patch-ab 2013/04/10 11:41:37 1.12
+++ pkgsrc/fonts/fontconfig/patches/Attic/patch-ab 2013/07/26 11:37:22 1.13
@@ -1,12 +1,24 @@ @@ -1,12 +1,24 @@
1$NetBSD: patch-ab,v 1.12 2013/04/10 11:41:37 wiz Exp $ 1$NetBSD: patch-ab,v 1.13 2013/07/26 11:37:22 ryoon Exp $
 2
 3On Debian GNU/kFreeBSD 7.0, there is posix_fadvise(2), but no
 4POSIX_FADV_WILLNEED.
2 5
3--- src/fccache.c.orig 2013-03-21 09:50:26.000000000 +0000 6--- src/fccache.c.orig 2013-03-21 09:50:26.000000000 +0000
4+++ src/fccache.c 7+++ src/fccache.c
5@@ -31,6 +31,7 @@ 8@@ -31,6 +31,7 @@
6 #include <dirent.h> 9 #include <dirent.h>
7 #include <string.h> 10 #include <string.h>
8 #include <sys/types.h> 11 #include <sys/types.h>
9+#include <sys/stat.h> 12+#include <sys/stat.h>
10 #include <assert.h> 13 #include <assert.h>
11 #if defined(HAVE_MMAP) || defined(__CYGWIN__) 14 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
12 # include <unistd.h> 15 # include <unistd.h>
 16@@ -575,7 +576,7 @@ FcDirCacheMapFd (int fd, struct stat *fd
 17 {
 18 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
 19 cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
 20-#ifdef HAVE_POSIX_FADVISE
 21+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
 22 posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
 23 #endif
 24 if (cache == MAP_FAILED)