summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-09-29 22:04:31 +0000
committerwiz <wiz@pkgsrc.org>2011-09-29 22:04:31 +0000
commit5948b1d84659197030db4b1d7dfca5008657838d (patch)
treed9fd3b9360840e17131af8b838706a14cb41c98f
parentcefda018db7d824b4ff2f49142b3084c1ba664b7 (diff)
downloadpkgsrc-5948b1d84659197030db4b1d7dfca5008657838d.tar.gz
Fix build on -current with fuse option turned on (default off).
From B.ICT A.P. deBROUWER Jr. in PR 45401.
-rw-r--r--sysutils/gvfs/distinfo4
-rw-r--r--sysutils/gvfs/patches/patch-ac14
2 files changed, 14 insertions, 4 deletions
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo
index 659e0f8b40c..48c4d076398 100644
--- a/sysutils/gvfs/distinfo
+++ b/sysutils/gvfs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2011/03/11 20:02:41 drochner Exp $
+$NetBSD: distinfo,v 1.19 2011/09/29 22:04:31 wiz Exp $
SHA1 (gvfs-1.6.6.tar.bz2) = 066800558370187abd838c358349bb73f1579f8b
RMD160 (gvfs-1.6.6.tar.bz2) = 705934a0a3f520a41237374abeb0182d01398903
Size (gvfs-1.6.6.tar.bz2) = 1387796 bytes
SHA1 (patch-aa) = c41dce6f0865fd351fc683ac1ff5a4d18d8880a8
-SHA1 (patch-ac) = 2e5837362b63c05ca5748a7e8a610dc7d651a9fa
+SHA1 (patch-ac) = fe029105897e3ffb68bfa505160df5d0bc66f643
SHA1 (patch-ad) = 8c8fe33189d182e769da5092fa309f01f56a1081
SHA1 (patch-ae) = 07b631786e89f38f831a1cc926818c15520fcd3b
SHA1 (patch-ag) = 8474aed53e07f2c3899bafc278d886c41ccd04a5
diff --git a/sysutils/gvfs/patches/patch-ac b/sysutils/gvfs/patches/patch-ac
index a626b713c7a..a009e5b033c 100644
--- a/sysutils/gvfs/patches/patch-ac
+++ b/sysutils/gvfs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2009/05/26 19:21:45 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2011/09/29 22:04:32 wiz Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=583927
---- client/gvfsfusedaemon.c.orig 2008-10-20 05:02:26.000000000 -0400
+--- client/gvfsfusedaemon.c.orig 2010-11-12 15:42:49.000000000 +0000
+++ client/gvfsfusedaemon.c
@@ -26,7 +26,9 @@
#include <sys/types.h>
@@ -14,3 +14,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583927
#include <sys/time.h>
#include <unistd.h>
#include <stdlib.h>
+@@ -2340,7 +2342,9 @@ vfs_init (struct fuse_conn_info *conn)
+ subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
+
+ /* Indicate O_TRUNC support for open() */
++#ifdef FUSE_CAP_ATOMIC_O_TRUNC
+ conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
++#endif
+
+ return NULL;
+ }