diff options
author | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 11:11:54 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 12:54:43 +0200 |
commit | 7dd46d19344c5601d83335fb5e6b7ee994cf26d2 (patch) | |
tree | ff12e91c5d3ad93743762db910865250befc36d0 /gnome-base/gvfs/files | |
parent | gnome-base/gsettings-desktop-schemas: Remove old (diff) | |
download | gentoo-7dd46d19344c5601d83335fb5e6b7ee994cf26d2.tar.gz gentoo-7dd46d19344c5601d83335fb5e6b7ee994cf26d2.tar.bz2 gentoo-7dd46d19344c5601d83335fb5e6b7ee994cf26d2.zip |
gnome-base/gvfs: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'gnome-base/gvfs/files')
4 files changed, 0 insertions, 191 deletions
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch b/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch deleted file mode 100644 index 0e8c49ae7fa9..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c259305847b1ebde1ae89a3c921a13b6c0b67116 Mon Sep 17 00:00:00 2001 -From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> -Date: Tue, 6 Oct 2015 15:09:04 +0900 -Subject: Avoid crash when no monitor implementations exist. - -The GVariantBuilder is unable to create any GVariant for -an untyped array - while an empty vector is a valid variant, -it is not valid for an untyped array. - -Passing the resulting null to gvfs_dbus_daemon_complete_cancel() -causes gvfs to abort with a g_error(). - -https://bugzilla.gnome.org/show_bug.cgi?id=756105 ---- - daemon/gvfsdaemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c -index 7bc334b..b7a3b88 100644 ---- a/daemon/gvfsdaemon.c -+++ b/daemon/gvfsdaemon.c -@@ -957,7 +957,7 @@ handle_list_monitor_implementations (GVfsDBusDaemon *object, - - impls = g_vfs_list_monitor_implementations (); - -- g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); -+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ssbia{sv})")); - - for (l = impls; l != NULL; l = l->next) - { --- -cgit v0.11.2 - diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch b/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch deleted file mode 100644 index 4bf90ad1f26c..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1220260f96a9ce2beb659da30888ea9648719e9a Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Wed, 30 Sep 2015 12:38:55 +0200 -Subject: proxy volume monitor: Guard access to the internal caches - -Accesses to the drives, volumes and mounts hash tables should be -guarded by the proxy_vm mutex. - -https://bugzilla.gnome.org/show_bug.cgi?id=755805 ---- - monitor/proxy/gproxyvolumemonitor.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c -index 623cb14..17474a8 100644 ---- a/monitor/proxy/gproxyvolumemonitor.c -+++ b/monitor/proxy/gproxyvolumemonitor.c -@@ -867,6 +867,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor) - GProxyVolume *volume; - GProxyMount *mount; - -+ G_LOCK (proxy_vm); -+ - seed_monitor (monitor); - - /* emit signals for all the drives/volumes/mounts "added" */ -@@ -881,6 +883,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor) - g_hash_table_iter_init (&hash_iter, monitor->mounts); - while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount)) - signal_emit_in_idle (monitor, "mount-added", mount); -+ -+ G_UNLOCK (proxy_vm); - } - - static void -@@ -891,6 +895,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor) - GProxyVolume *volume; - GProxyMount *mount; - -+ G_LOCK (proxy_vm); -+ - g_hash_table_iter_init (&hash_iter, monitor->mounts); - while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount)) - { -@@ -914,6 +920,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor) - signal_emit_in_idle (monitor, "drive-disconnected", drive); - } - g_hash_table_remove_all (monitor->drives); -+ -+ G_UNLOCK (proxy_vm); - } - - static void --- -cgit v0.11.2 - diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch b/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch deleted file mode 100644 index bc47a1a3db36..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d19a4bc2475705f8252f8952c446b57b31661453 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Fri, 16 Oct 2015 13:35:34 +0200 -Subject: proxy volume monitor: Properly handle failure to create a remote - proxy - -We should finish constructing the innards of the object and not leave -it in an inconsistent state when we hit an error. The other option -would be to litter the rest of the code with NULL checks, but that -would be ugly and prone to errors. - -We should also ensure that the reference counting stays consistent with -the non-error paths. - -https://bugzilla.gnome.org/show_bug.cgi?id=755805 ---- - monitor/proxy/gproxyvolumemonitor.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c -index 17474a8..a7466f0 100644 ---- a/monitor/proxy/gproxyvolumemonitor.c -+++ b/monitor/proxy/gproxyvolumemonitor.c -@@ -972,10 +972,7 @@ g_proxy_volume_monitor_constructor (GType type, - klass = G_PROXY_VOLUME_MONITOR_CLASS (g_type_class_peek (type)); - object = g_hash_table_lookup (the_volume_monitors, (gpointer) type); - if (object != NULL) -- { -- g_object_ref (object); -- goto out; -- } -+ goto out; - - dbus_name = klass->dbus_name; - -@@ -988,6 +985,10 @@ g_proxy_volume_monitor_constructor (GType type, - - monitor = G_PROXY_VOLUME_MONITOR (object); - -+ monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -+ monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -+ monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -+ - error = NULL; - monitor->proxy = gvfs_remote_volume_monitor_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -@@ -1022,10 +1023,6 @@ g_proxy_volume_monitor_constructor (GType type, - g_signal_connect (monitor->proxy, "volume-changed", G_CALLBACK (volume_changed), monitor); - g_signal_connect (monitor->proxy, "volume-removed", G_CALLBACK (volume_removed), monitor); - -- monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -- monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -- monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -- - /* 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 */ -@@ -1038,12 +1035,12 @@ g_proxy_volume_monitor_constructor (GType type, - - g_hash_table_insert (the_volume_monitors, (gpointer) type, object); - -+ out: - /* Take an extra reference to make the instance live forever - see also - * the dispose() and finalize() vfuncs - */ - g_object_ref (object); - -- out: - G_UNLOCK (proxy_vm); - return object; - } --- -cgit v0.11.2 - diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch b/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch deleted file mode 100644 index 69a762968e37..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7bcfc873fd54e565836228ab030782885e133ebb Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Fri, 21 Aug 2015 16:54:46 +0200 -Subject: dav: Mark files as untrashable - -Otherwise nautilus will offer the wrong action in its UI. - -https://bugzilla.gnome.org/show_bug.cgi?id=753934 ---- - daemon/gvfsbackenddav.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c -index 2d2704a..94e8b1c 100644 ---- a/daemon/gvfsbackenddav.c -+++ b/daemon/gvfsbackenddav.c -@@ -974,6 +974,8 @@ ms_response_to_file_info (MsResponse *response, - if (basename && basename[0] == '.') - g_file_info_set_is_hidden (info, TRUE); - -+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE); -+ - file_type = G_FILE_TYPE_REGULAR; - mime_type = NULL; - --- -cgit v0.11.2 - |