summaryrefslogtreecommitdiff
path: root/sysutils/gvfs/patches
diff options
context:
space:
mode:
authorobache <obache>2012-05-30 13:52:18 +0000
committerobache <obache>2012-05-30 13:52:18 +0000
commite4f4a24488eed484a51cc98038ceb0098f884ad5 (patch)
tree3d66b905a557d191d3845d605816c51a5bd8be04 /sysutils/gvfs/patches
parent759d2780d37307f381020011773e045a8eaa13ef (diff)
downloadpkgsrc-e4f4a24488eed484a51cc98038ceb0098f884ad5.tar.gz
Fixes build with glib2>2.30, direct includion of header file is not allowed.
patch via PR 46453 by Noud de Brouwer.
Diffstat (limited to 'sysutils/gvfs/patches')
-rw-r--r--sysutils/gvfs/patches/patch-ac16
1 files changed, 13 insertions, 3 deletions
diff --git a/sysutils/gvfs/patches/patch-ac b/sysutils/gvfs/patches/patch-ac
index a009e5b033c..67871225cec 100644
--- a/sysutils/gvfs/patches/patch-ac
+++ b/sysutils/gvfs/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2011/09/29 22:04:32 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2012/05/30 13:52:19 obache Exp $
-http://bugzilla.gnome.org/show_bug.cgi?id=583927
+* http://bugzilla.gnome.org/show_bug.cgi?id=583927
+* directly includion of glib/gurifuncs.h is not allowed by GLib>=2.30
--- client/gvfsfusedaemon.c.orig 2010-11-12 15:42:49.000000000 +0000
+++ client/gvfsfusedaemon.c
@@ -14,7 +15,16 @@ 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)
+@@ -41,8 +43,6 @@
+ #include <glib/gprintf.h>
+ #include <gio/gio.h>
+
+-#include <glib/gurifuncs.h>
+-
+ /* stuff from common/ */
+ #include <gdaemonmount.h>
+ #include <gvfsdaemonprotocol.h>
+@@ -2340,7 +2340,9 @@ vfs_init (struct fuse_conn_info *conn)
subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
/* Indicate O_TRUNC support for open() */