r34755 - in /desktop/unstable/gvfs/debian: changelog patches/00git_fix_build.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue May  8 21:23:11 2012
New Revision: 34755

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34755
Log:
Add 00git_fix_build.patch: Fix building with gcc 4.7. Patch taken from
upstream git.

Added:
    desktop/unstable/gvfs/debian/patches/00git_fix_build.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=34755&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Tue May  8 21:23:11 2012
@@ -1,3 +1,10 @@
+gvfs (1.12.2-2) UNRELEASED; urgency=low
+
+  * Add 00git_fix_build.patch: Fix building with gcc 4.7. Patch taken from
+    upstream git.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 08 May 2012 14:21:51 -0700
+
 gvfs (1.12.2-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gvfs/debian/patches/00git_fix_build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/00git_fix_build.patch?rev=34755&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/00git_fix_build.patch (added)
+++ desktop/unstable/gvfs/debian/patches/00git_fix_build.patch [utf-8] Tue May  8 21:23:11 2012
@@ -1,0 +1,29 @@
+commit 7fe5deeae25f2396027f667d8960d2ec84c64716
+Author: Matthias Clasen <mclasen at redhat.com>
+Date:   Mon Apr 30 06:09:30 2012 -0400
+
+    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.
+
+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
++}

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=34755&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Tue May  8 21:23:11 2012
@@ -1,3 +1,4 @@
+00git_fix_build.patch
 01_modules_dir.patch
 03_xdg-mount.patch
 04_hurd_path_max.patch