diff options
| author | obache <obache@pkgsrc.org> | 2012-05-30 13:52:18 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-05-30 13:52:18 +0000 |
| commit | 36f82c7d3c7d427d575c4cacfeea53f3227e058e (patch) | |
| tree | 3d66b905a557d191d3845d605816c51a5bd8be04 /sysutils | |
| parent | 6202e9b68da6071f3a920ebd6852f92077378e2a (diff) | |
| download | pkgsrc-36f82c7d3c7d427d575c4cacfeea53f3227e058e.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')
| -rw-r--r-- | sysutils/gvfs/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/gvfs/patches/patch-ac | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/sysutils/gvfs/distinfo b/sysutils/gvfs/distinfo index 690a310d678..47f86478023 100644 --- a/sysutils/gvfs/distinfo +++ b/sysutils/gvfs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.20 2012/02/23 19:08:23 drochner Exp $ +$NetBSD: distinfo,v 1.21 2012/05/30 13:52:18 obache 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) = fe029105897e3ffb68bfa505160df5d0bc66f643 +SHA1 (patch-ac) = 2168ed0d5883747e9b4e1b938ee818e6aefb8e56 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 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() */ |