[arch-commits] Commit in gvfs/trunk (4 files)
Jan de Groot
jgc at archlinux.org
Thu Nov 8 21:39:53 UTC 2012
Date: Thursday, November 8, 2012 @ 16:39:53
Author: jgc
Revision: 170568
upgpkg: gvfs 1.14.1-2
Add upstream patches to fix some dbus connect/disconnect issues with applications using it
Added:
gvfs/trunk/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
gvfs/trunk/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
gvfs/trunk/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
Modified:
gvfs/trunk/PKGBUILD
----------------------------------------------------------------------+
PKGBUILD | 17 +++++-
gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch | 24 +++++++++
proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch | 25 ++++++++++
proxy-volume-monitor-Dont-force-close-the-session-bus.patch | 23 +++++++++
4 files changed, 86 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-11-08 21:26:53 UTC (rev 170567)
+++ PKGBUILD 2012-11-08 21:39:53 UTC (rev 170568)
@@ -4,16 +4,22 @@
pkgbase=gvfs
pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
pkgver=1.14.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL')
makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
url="http://www.gnome.org"
options=(!libtool)
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
- do-not-emit-connected-added-signals-at-object-creation.patch)
+ do-not-emit-connected-added-signals-at-object-creation.patch
+ gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
+ proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
+ proxy-volume-monitor-Dont-force-close-the-session-bus.patch)
sha256sums=('0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a'
- '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0')
+ '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0'
+ '0d509e335f931aceff2b5ce613dd3dec5a7f8ebbca379d8b3e3e4cf0848a9a72'
+ '26225a7ebfa0144d0481b4af0e9c141920c91c022c67003e92b875f8ecc38069'
+ 'af7d7bcc5777f356169b13aa86308222fb59c8ba56744f6393a97db0f80c3ed6')
build() {
cd "$pkgbase-$pkgver"
@@ -22,6 +28,11 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=684677
patch -Np1 -i "$srcdir/do-not-emit-connected-added-signals-at-object-creation.patch"
+ # Fixes from gnome-3-6 branch
+ patch -Np1 -i "$srcdir/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch"
+ patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch"
+ patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-force-close-the-session-bus.patch"
+
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/gvfs \
Added: gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
===================================================================
--- gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch (rev 0)
+++ gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch 2012-11-08 21:39:53 UTC (rev 170568)
@@ -0,0 +1,24 @@
+From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Mon, 22 Oct 2012 13:07:04 +0000
+Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686637
+---
+diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
+index 53f22b5..ca77648 100644
+--- a/client/gdaemonmount.c
++++ b/client/gdaemonmount.c
+@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount,
+ data = g_new0 (AsyncProxyCreate, 1);
+ data->mount = g_object_ref (mount);
+ data->mount_info = daemon_mount->mount_info;
+- data->mount_operation = g_object_ref (mount_operation);
+ data->flags = flags;
++ if (mount_operation)
++ data->mount_operation = g_object_ref (mount_operation);
+ if (cancellable)
+ data->cancellable = g_object_ref (cancellable);
+
+--
+cgit v0.9.0.2
Added: proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
===================================================================
--- proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch (rev 0)
+++ proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch 2012-11-08 21:39:53 UTC (rev 170568)
@@ -0,0 +1,25 @@
+From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Thu, 01 Nov 2012 13:37:37 +0000
+Subject: proxy volume monitor: Don't disable exit_on_close on session bus
+
+We're on shared session bus, let's exit when connection closes
+(usually tied to running desktop session).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687074
+(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d)
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 1af6c34..e0d17b7 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void)
+ g_error_free (error);
+ goto out;
+ }
+- g_dbus_connection_set_exit_on_close (the_session_bus, FALSE);
+
+ the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+--
+cgit v0.9.0.2
Added: proxy-volume-monitor-Dont-force-close-the-session-bus.patch
===================================================================
--- proxy-volume-monitor-Dont-force-close-the-session-bus.patch (rev 0)
+++ proxy-volume-monitor-Dont-force-close-the-session-bus.patch 2012-11-08 21:39:53 UTC (rev 170568)
@@ -0,0 +1,23 @@
+From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Thu, 01 Nov 2012 13:46:10 +0000
+Subject: proxy volume monitor: Don't force-close the session bus
+
+Simple fix to prevent bus closing on GIO module unload.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687074
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index e0d17b7..df99935 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void)
+ G_LOCK (proxy_vm);
+ if (the_session_bus != NULL)
+ {
+- g_dbus_connection_close_sync (the_session_bus, NULL, NULL);
+ g_object_unref (the_session_bus);
+ the_session_bus = NULL;
+
+--
+cgit v0.9.0.2
More information about the arch-commits
mailing list