diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-10 00:47:12 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-10 00:47:12 +0000 |
commit | 7d79f566e4da0fdfe38636ba4c34fcd900c37af8 (patch) | |
tree | ecaa347c5a11236575441b52bb900c3f7a33aec8 /gnome-base/gvfs/files | |
parent | Revision bump. Fix bug #414995 (diff) | |
download | gentoo-2-7d79f566e4da0fdfe38636ba4c34fcd900c37af8.tar.gz gentoo-2-7d79f566e4da0fdfe38636ba4c34fcd900c37af8.tar.bz2 gentoo-2-7d79f566e4da0fdfe38636ba4c34fcd900c37af8.zip |
Fix failure with USE=afp and glib-2.32.2 (bug #414787, thanks to Randy Tupas). Drop old.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gvfs/files')
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch b/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch new file mode 100644 index 000000000000..09e11d888545 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.12.2-afp-g_clear_object.patch @@ -0,0 +1,35 @@ +From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Mon, 30 Apr 2012 06:09:30 -0400 +Subject: [PATCH] afp: Use g_clear_object properly + +g_clear_object expects the address of a pointer. A recent +change in its definition makes gcc complain about this. +(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716) +--- + daemon/gvfsafpvolume.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c +index 3fd33f2..5207459 100644 +--- a/daemon/gvfsafpvolume.c ++++ b/daemon/gvfsafpvolume.c +@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res + return; + + error: +- g_clear_object (info); ++ g_clear_object (&info); + g_simple_async_result_take_error (simple, err); + g_simple_async_result_complete (simple); + g_object_unref (simple); +@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume *volume, + *bytes_read = g_simple_async_result_get_op_res_gssize (simple); + + return TRUE; +-} +\ No newline at end of file ++} +-- +1.7.8.6 + |