summaryrefslogtreecommitdiff
path: root/extra/gvfs
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-11-07 01:04:45 -0800
committerroot <root@rshg054.dnsready.net>2012-11-07 01:04:45 -0800
commita8fff09ba6d0f8b78b43e63541b1254763d4f48e (patch)
treed5ed9796d5aa31b378f4bfed4482b84008e731fa /extra/gvfs
parent85e0e667660650d70269432a90401d4288776d9d (diff)
Wed Nov 7 01:04:45 PST 2012
Diffstat (limited to 'extra/gvfs')
-rw-r--r--extra/gvfs/PKGBUILD15
-rw-r--r--extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch39
2 files changed, 50 insertions, 4 deletions
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 903546354..9b966cd4c 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,20 +1,27 @@
-# $Id: PKGBUILD 169942 2012-10-30 22:46:10Z heftig $
+# $Id: PKGBUILD 170252 2012-11-06 11:45:54Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gvfs
pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.0
+pkgver=1.14.1
pkgrel=1
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)
-sha256sums=('71ab8cf60070025d1aff9bee1f514fdb45682ffad01b6856cabab1bc3791bfb4')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+ do-not-emit-connected-added-signals-at-object-creation.patch)
+sha256sums=('0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a'
+ '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0')
build() {
cd "$pkgbase-$pkgver"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=687525
+ # https://bugzilla.gnome.org/show_bug.cgi?id=684677
+ patch -Np1 -i "$srcdir/do-not-emit-connected-added-signals-at-object-creation.patch"
+
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/gvfs \
diff --git a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
new file mode 100644
index 000000000..9369c87bd
--- /dev/null
+++ b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
@@ -0,0 +1,39 @@
+From ca7743a63721c3dd1c166006539e356412466dcc Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Sun, 23 Sep 2012 18:51:32 +0000
+Subject: proxy: don't emit connected/added signals at object creation
+
+It's unnecessary to emit those signals when the object is created, and
+it can cause weird side-effects if applications e.g. play a sound on
+signal emission.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684677
+---
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 1af6c34..37fc788 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -955,6 +955,7 @@ g_proxy_volume_monitor_constructor (GType type,
+ GObjectClass *parent_class;
+ GError *error;
+ const char *dbus_name;
++ gchar *name_owner;
+
+ G_LOCK (proxy_vm);
+
+@@ -1018,7 +1019,12 @@ g_proxy_volume_monitor_constructor (GType type,
+ /* listen to when the owner of the service appears/disappears */
+ g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
+ /* initially seed drives/volumes/mounts if we have an owner */
+- name_owner_changed (G_OBJECT (monitor->proxy), NULL, monitor);
++ name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (monitor->proxy));
++ if (name_owner != NULL)
++ {
++ seed_monitor (monitor);
++ g_free (name_owner);
++ }
+
+ g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
+
+--
+cgit v0.9.0.2