summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/gvfs/files')
-rw-r--r--gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch25
-rw-r--r--gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch54
2 files changed, 0 insertions, 79 deletions
diff --git a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch b/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
deleted file mode 100644
index 9e2ed6612200..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 62c4c2af399dba0566ae69353f127472fa3e3364 Mon Sep 17 00:00:00 2001
-From: Ross Lagerwall <rosslagerwall@gmail.com>
-Date: Mon, 16 Mar 2015 00:06:07 +0000
-Subject: completion: Fix parallel installation
-
-Use install-data-hook rather than install-data-local as
-install-data-hook runs after the other install rules have run. This is
-important for a parallel install so that the destination directory
-already exists when the symlinks are created.
-
-diff --git a/programs/completion/Makefile.am b/programs/completion/Makefile.am
-index 06833e5..971e4ee 100644
---- a/programs/completion/Makefile.am
-+++ b/programs/completion/Makefile.am
-@@ -35,6 +35,6 @@ uninstall-symlinks:
- rm -f $(DESTDIR)$(BASHCOMP_DIR)/$$file; \
- done
-
--install-data-local: install-symlinks
-+install-data-hook: install-symlinks
-
- uninstall-local: uninstall-symlinks
---
-cgit v0.10.2
-
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
deleted file mode 100644
index 09b822f133c8..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d663c85f0356d7800638c5eaa1a49e6c26bdfa33 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Fri, 27 Feb 2015 10:22:22 +0100
-Subject: afp: Change g_error to g_warning for read errors
-
-Use g_warning rather than g_error when a read error occurs to prevent
-spurious crash reports since there are many different ways for a read
-from the network to fail.
-
-[Cherry-picked from gnome-3-14/14369db2a8fc
- Commit message written by Ross Lagerwall.]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710490
----
- daemon/gvfsafpconnection.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c
-index c8ccad7..abe1422 100644
---- a/daemon/gvfsafpconnection.c
-+++ b/daemon/gvfsafpconnection.c
-@@ -1078,12 +1078,12 @@ read_data_cb (GObject *object, GAsyncResult *res, gpointer user_data)
- g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
- {
- g_message (_("Host closed connection"));
-- exit(0);
- }
- else
- {
-- g_error ("FAIL!!! \"%s\"\n", err->message);
-+ g_warning ("FAIL!!! \"%s\"\n", err->message);
- }
-+ exit (0);
- }
-
- dispatch_reply (afp_connection);
-@@ -1120,12 +1120,12 @@ read_dsi_header_cb (GObject *object, GAsyncResult *res, gpointer user_data)
- g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
- {
- g_message (_("Host closed connection"));
-- exit(0);
- }
- else
- {
-- g_error ("FAIL!!! \"%s\"\n", err->message);
-+ g_warning ("FAIL!!! \"%s\"\n", err->message);
- }
-+ exit (0);
- }
-
- dsi_header = &priv->read_dsi_header;
---
-cgit v0.11.2
-