pkg/46453: sysutils/gvfs needs glib2 patch to build again

[noud4%home.nl@localhost]

>Number:         46453
>Category:       pkg
>Synopsis:       sysutils/gvfs needs glib2 patch to build again
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 14 15:10:00 +0000 2012
>Originator:     Noud de Brouwer
>Release:        6.99.4
>Organization:
-none-
>Environment:
NetBSD 10.0.2.17 6.99.4 NetBSD 6.99.4 (MONOLITHIC) #0: Wed Apr 18 09:37:46 UTC 
2012  mickey55@10.0.2.17:/obj-src/sys/arch/i386/compile/MONOLITHIC i386
>Description:
after glib2 update it's build fails:

  CC     gvfs_fuse_daemon-gvfsfusedaemon.o

<command-line>:0:0: warning: "G_LOG_DOMAIN" redefined

<command-line>:0:0: note: this is the location of the previous definition

In file included from gvfsfusedaemon.c:46:0:

/obj/sysutils/gvfs/work/.buildlink/include/glib/glib-2.0/glib/gurifuncs.h:24:2: 
error: #error "Only <glib.h> can be included directly."

gvfsfusedaemon.c: In function 'get_file_handle_from_info':

gvfsfusedaemon.c:341:8: warning: cast to pointer from integer of different size

gvfsfusedaemon.c: In function 'vfs_open':

gvfsfusedaemon.c:1024:15: warning: cast from pointer to integer of different 
size

gvfsfusedaemon.c: In function 'vfs_create':

gvfsfusedaemon.c:1122:15: warning: cast from pointer to integer of different 
size

gmake[2]: *** [gvfs_fuse_daemon-gvfsfusedaemon.o] Error 1

gmake[2]: Leaving directory `/obj/sysutils/gvfs/work/gvfs-1.6.6/client'

gmake[1]: *** [all-recursive] Error 1

gmake[1]: Leaving directory `/obj/sysutils/gvfs/work/gvfs-1.6.6'

gmake: *** [all] Error 2

*** Error code 2


>How-To-Repeat:
cd sysutils/gvfs && make
>Fix:
add small patch in patches/patch-ac, so it becomes:

$NetBSD: patch-ac,v 1.3 2011/09/29 22:04:32 wiz Exp $

http://bugzilla.gnome.org/show_bug.cgi?id=583927

glib2

--- client/gvfsfusedaemon.c.orig        2010-11-12 15:42:49.000000000 +0000
+++ client/gvfsfusedaemon.c
@@ -26,7 +26,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#if !defined(__NetBSD__)
 #include <sys/vfs.h>
+#endif
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -43,7 +43,6 @@
 #include <glib/gprintf.h>
 #include <gio/gio.h>
 
-#include <glib/gurifuncs.h>
 
 /* stuff from common/ */
 #include <gdaemonmount.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;
 }