Thu Sep 29 22:04:32 2011 UTC ()
Fix build on -current with fuse option turned on (default off).
>From B.ICT A.P. deBROUWER Jr. in PR 45401.


(wiz)
diff -r1.18 -r1.19 pkgsrc/sysutils/gvfs/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/gvfs/patches/patch-ac
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/gvfs/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/distinfo 2011/03/11 20:02:41 1.18
+++ pkgsrc/sysutils/gvfs/distinfo 2011/09/29 22:04:31 1.19
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.18 2011/03/11 20:02:41 drochner Exp $ 1$NetBSD: distinfo,v 1.19 2011/09/29 22:04:31 wiz Exp $
2 2
3SHA1 (gvfs-1.6.6.tar.bz2) = 066800558370187abd838c358349bb73f1579f8b 3SHA1 (gvfs-1.6.6.tar.bz2) = 066800558370187abd838c358349bb73f1579f8b
4RMD160 (gvfs-1.6.6.tar.bz2) = 705934a0a3f520a41237374abeb0182d01398903 4RMD160 (gvfs-1.6.6.tar.bz2) = 705934a0a3f520a41237374abeb0182d01398903
5Size (gvfs-1.6.6.tar.bz2) = 1387796 bytes 5Size (gvfs-1.6.6.tar.bz2) = 1387796 bytes
6SHA1 (patch-aa) = c41dce6f0865fd351fc683ac1ff5a4d18d8880a8 6SHA1 (patch-aa) = c41dce6f0865fd351fc683ac1ff5a4d18d8880a8
7SHA1 (patch-ac) = 2e5837362b63c05ca5748a7e8a610dc7d651a9fa 7SHA1 (patch-ac) = fe029105897e3ffb68bfa505160df5d0bc66f643
8SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081 8SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
9SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b 9SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
10SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5 10SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5
11SHA1 (patch-ah) = 39c6fe4fe7640e8c073da5857ba33fb7083d4a72 11SHA1 (patch-ah) = 39c6fe4fe7640e8c073da5857ba33fb7083d4a72
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/gvfs/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/gvfs/patches/patch-ac 2009/05/26 19:21:45 1.2
+++ pkgsrc/sysutils/gvfs/patches/patch-ac 2011/09/29 22:04:32 1.3
@@ -1,16 +1,26 @@ @@ -1,16 +1,26 @@
1$NetBSD: patch-ac,v 1.2 2009/05/26 19:21:45 wiz Exp $ 1$NetBSD: patch-ac,v 1.3 2011/09/29 22:04:32 wiz Exp $
2 2
3http://bugzilla.gnome.org/show_bug.cgi?id=583927 3http://bugzilla.gnome.org/show_bug.cgi?id=583927
4 4
5--- client/gvfsfusedaemon.c.orig 2008-10-20 05:02:26.000000000 -0400 5--- client/gvfsfusedaemon.c.orig 2010-11-12 15:42:49.000000000 +0000
6+++ client/gvfsfusedaemon.c 6+++ client/gvfsfusedaemon.c
7@@ -26,7 +26,9 @@ 7@@ -26,7 +26,9 @@
8 #include <sys/types.h> 8 #include <sys/types.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 #include <sys/un.h> 10 #include <sys/un.h>
11+#if !defined(__NetBSD__) 11+#if !defined(__NetBSD__)
12 #include <sys/vfs.h> 12 #include <sys/vfs.h>
13+#endif 13+#endif
14 #include <sys/time.h> 14 #include <sys/time.h>
15 #include <unistd.h> 15 #include <unistd.h>
16 #include <stdlib.h> 16 #include <stdlib.h>
 17@@ -2340,7 +2342,9 @@ vfs_init (struct fuse_conn_info *conn)
 18 subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
 19
 20 /* Indicate O_TRUNC support for open() */
 21+#ifdef FUSE_CAP_ATOMIC_O_TRUNC
 22 conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
 23+#endif
 24
 25 return NULL;
 26 }