diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-11-21 17:25:52 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-21 17:25:52 +0000 |
| commit | 7b2947d1f809b9a68c1584f89419a67434316460 (patch) | |
| tree | b301c1f8ea55e243df8563a2c21b9a9c1cf632a0 /devel | |
| parent | bd62e67cee2c01785275d1383571b3cbd96788c6 (diff) | |
| download | ports-7b2947d1f809b9a68c1584f89419a67434316460.tar.gz ports-7b2947d1f809b9a68c1584f89419a67434316460.zip | |
Notes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gvfs/Makefile | 5 | ||||
| -rw-r--r-- | devel/gvfs/files/patch-client_gvfsfusedaemon.c | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 69d47af14958..50423b59ed44 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -31,11 +31,10 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-obexftp -OPTIONS= SAMBA "Enable Samba" on \ +OPTIONS= FUSE "Enable fuse" off \ + SAMBA "Enable Samba" on \ GPHOTO2 "Enable Gphoto 2 camera support" on \ CDDA "Enable CDDA" on -# disabled beacuse it breaks the build: FUSE "Enable fuse" off \ -# -- mandree@ 2010-11-21 .include <bsd.port.pre.mk> diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c index 3733aa7e3cd9..2ea9b3330625 100644 --- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c +++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c @@ -1,6 +1,6 @@ ---- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500 -+++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500 -@@ -28,7 +28,9 @@ +--- client/gvfsfusedaemon.c.orig 2010-11-12 16:42:49.000000000 +0100 ++++ client/gvfsfusedaemon.c 2010-11-21 18:23:36.000000000 +0100 +@@ -26,7 +26,9 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -10,3 +10,13 @@ #include <sys/time.h> #include <unistd.h> #include <stdlib.h> +@@ -2340,7 +2342,9 @@ + 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; + } |