diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile index e331d3f087d..1f738fe596d 100644 --- a/x11/gnome/gvfs/Makefile +++ b/x11/gnome/gvfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.90 2013/04/05 14:07:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.91 2013/04/06 09:02:33 ajacoutot Exp $ COMMENT-main= GNOME Virtual File System COMMENT-smb= GVFS mount module for samba @@ -11,8 +11,9 @@ PKGNAME-main= ${DISTNAME} PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION} PKGNAME-goa= ${GNOME_PROJECT}-goa-${GNOME_VERSION} -REVISION-main= 3 -REVISION-smb= 0 +REVISION-main= 4 +REVISION-smb= 1 +REVISION-goa= 0 SHARED_LIBS += gvfscommon 4.0 # .0.0 diff --git a/x11/gnome/gvfs/patches/patch-daemon_gvfsjoberror_c b/x11/gnome/gvfs/patches/patch-daemon_gvfsjoberror_c index add455a36cf..01b5ff62736 100644 --- a/x11/gnome/gvfs/patches/patch-daemon_gvfsjoberror_c +++ b/x11/gnome/gvfs/patches/patch-daemon_gvfsjoberror_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-daemon_gvfsjoberror_c,v 1.1 2013/04/05 14:07:31 ajacoutot Exp $ +$OpenBSD: patch-daemon_gvfsjoberror_c,v 1.2 2013/04/06 09:02:33 ajacoutot Exp $ From d667f6fe956d8661710f9fe5ad3e54d9b24aa04a Mon Sep 17 00:00:00 2001 From: Alexander Larsson @@ -10,9 +10,14 @@ From: Alexander Larsson Date: Thu, 04 Apr 2013 17:50:56 +0000 Subject: remove debug spew ---- daemon/gvfsjoberror.c.orig Fri Apr 5 15:52:42 2013 -+++ daemon/gvfsjoberror.c Fri Apr 5 15:52:00 2013 -@@ -0,0 +1,106 @@ +From 210dab51a9db47795b03d3090c3ffdfd3bf3a1df Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 05 Apr 2013 12:00:59 +0000 +Subject: GVfsJobError: Return TRUE in try + +--- daemon/gvfsjoberror.c.orig Sat Apr 6 10:56:03 2013 ++++ daemon/gvfsjoberror.c Sat Apr 6 10:56:41 2013 +@@ -0,0 +1,107 @@ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2006-2007 Red Hat, Inc. @@ -118,4 +123,5 @@ Subject: remove debug spew +try (GVfsJob *job) +{ + g_vfs_job_failed_from_error (job, G_VFS_JOB_ERROR (job)->error); ++ return TRUE; +} diff --git a/x11/gnome/gvfs/pkg/DESCR-goa b/x11/gnome/gvfs/pkg/DESCR-goa index 12880cfa4f4..662483d2bca 100644 --- a/x11/gnome/gvfs/pkg/DESCR-goa +++ b/x11/gnome/gvfs/pkg/DESCR-goa @@ -1 +1,2 @@ -This package provides the goa volume monitor for GVFS. +This package provides the gnome-online-accounts volume monitor for GVFS +which allows integration with e.g. ownCloud. diff --git a/x11/gnome/gvfs/pkg/DESCR-smb b/x11/gnome/gvfs/pkg/DESCR-smb index a6ea67925c8..94e730bf540 100644 --- a/x11/gnome/gvfs/pkg/DESCR-smb +++ b/x11/gnome/gvfs/pkg/DESCR-smb @@ -1,2 +1,2 @@ -This package provides the smb module for GVFS, which allows it to browse -networks using the SMB/CIFS protocols (a.k.a. Microsoft Networks). +This package provides the samba module for GVFS, which allows it to +browse networks using the SMB/CIFS protocols (i.e. Microsoft Networks).