diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile index 132534a5b82..152495a7535 100644 --- a/x11/gnome/gvfs/Makefile +++ b/x11/gnome/gvfs/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.62 2011/10/12 06:56:09 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.63 2011/10/17 13:24:59 ajacoutot Exp $ COMMENT-main= GNOME virtual file system COMMENT-smb= samba module for GVFS GNOME_PROJECT= gvfs -GNOME_VERSION= 1.10.0 +GNOME_VERSION= 1.10.1 PKGNAME-main= ${DISTNAME} PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION} -REVISION-main= 1 - SHARED_LIBS += gvfscommon 3.0 # .0.0 SHARED_LIBS += gvfscommon-dnssd 1.0 # .0.0 diff --git a/x11/gnome/gvfs/distinfo b/x11/gnome/gvfs/distinfo index 7dc64bca0b3..e7e599db305 100644 --- a/x11/gnome/gvfs/distinfo +++ b/x11/gnome/gvfs/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gvfs-1.10.0.tar.xz) = uEfu1UEsDtjQ97z2u55ixA== -RMD160 (gnome/gvfs-1.10.0.tar.xz) = ywOeub7yqiP9kB5WtBaXBpruMSw= -SHA1 (gnome/gvfs-1.10.0.tar.xz) = ClX+j1L/MXfhIXuk4moZNm/Q0G0= -SHA256 (gnome/gvfs-1.10.0.tar.xz) = UJcPn5BS7Larg4YLNmxxiZS/YYaVAQwR4TkcqIb3Hbg= -SIZE (gnome/gvfs-1.10.0.tar.xz) = 1291556 +MD5 (gnome/gvfs-1.10.1.tar.xz) = DJaHBL4APS9uqyk4jEFmTg== +RMD160 (gnome/gvfs-1.10.1.tar.xz) = 5Q2W/AtqqdKrUKPPxcFhvl1ubhY= +SHA1 (gnome/gvfs-1.10.1.tar.xz) = 1WTZk0GRNC5kIc0Dj8BnT43Sfq4= +SHA256 (gnome/gvfs-1.10.1.tar.xz) = zTD6zuWtbND6/FM3u/fAagv/OTb5/yrjFRmzAe/Mkog= +SIZE (gnome/gvfs-1.10.1.tar.xz) = 1295236 diff --git a/x11/gnome/gvfs/patches/patch-daemon_gvfsjobunmount_c b/x11/gnome/gvfs/patches/patch-daemon_gvfsjobunmount_c deleted file mode 100644 index 609d06e0621..00000000000 --- a/x11/gnome/gvfs/patches/patch-daemon_gvfsjobunmount_c +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-daemon_gvfsjobunmount_c,v 1.1 2011/10/05 13:56:08 ajacoutot Exp $ - -From 1f5c16b8ac679b322f2bed33c8e6cc5ed6096ff3 Mon Sep 17 00:00:00 2001 -From: Michael Terry -Date: Thu, 29 Sep 2011 15:57:32 +0000 -Subject: daemon: Grab a pointer to the GvfsBackend before unref'ing a job source, preventing a crash. - ---- daemon/gvfsjobunmount.c.orig Mon Sep 26 15:14:03 2011 -+++ daemon/gvfsjobunmount.c Wed Oct 5 15:49:04 2011 -@@ -231,6 +231,7 @@ unregister_mount_callback (DBusMessage *unmount_reply, - gpointer user_data) - { - GVfsBackend *backend; -+ GVfsDaemon *daemon; - GVfsJobUnmount *op_job = G_VFS_JOB_UNMOUNT (user_data); - - g_debug ("unregister_mount_callback, unmount_reply: %p, error: %p\n", unmount_reply, error); -@@ -239,9 +240,10 @@ unregister_mount_callback (DBusMessage *unmount_reply, - (*G_VFS_JOB_CLASS (g_vfs_job_unmount_parent_class)->send_reply) (G_VFS_JOB (op_job)); - - /* Unlink job source from daemon */ -+ daemon = g_vfs_backend_get_daemon (backend); - g_vfs_job_source_closed (G_VFS_JOB_SOURCE (backend)); - -- g_vfs_daemon_close_active_channels (g_vfs_backend_get_daemon ((backend))); -+ g_vfs_daemon_close_active_channels (daemon); - } - - /* Might be called on an i/o thread */