r43503 - in /desktop/unstable/gvfs/debian: changelog patches/dont-crash-on-null-job.patch patches/handle-inactive-vfs.patch patches/metadata-dont-flush-null-tree.patch patches/metadata-nuke-junk-data.patch patches/ref-jobs-in-thread.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Oct 13 13:51:36 UTC 2014 

Author: biebl
Date: Mon Oct 13 13:51:35 2014
New Revision: 43503

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43503
Log:
* Refresh patches:
  - debian/patches/dont-crash-on-null-job.patch
  - debian/patches/handle-inactive-vfs.patch
  - debian/patches/metadata-dont-flush-null-tree.patch
  - debian/patches/metadata-nuke-junk-data.patch
  - debian/patches/ref-jobs-in-thread.patch

Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/dont-crash-on-null-job.patch
    desktop/unstable/gvfs/debian/patches/handle-inactive-vfs.patch
    desktop/unstable/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
    desktop/unstable/gvfs/debian/patches/metadata-nuke-junk-data.patch
    desktop/unstable/gvfs/debian/patches/ref-jobs-in-thread.patch

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog	[utf-8] Mon Oct 13 13:51:35 2014
@@ -1,6 +1,13 @@
 gvfs (1.22.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches:
+    - debian/patches/dont-crash-on-null-job.patch
+    - debian/patches/handle-inactive-vfs.patch
+    - debian/patches/metadata-dont-flush-null-tree.patch
+    - debian/patches/metadata-nuke-junk-data.patch
+    - debian/patches/ref-jobs-in-thread.patch
+
 
  -- Michael Biebl <biebl at debian.org>  Mon, 13 Oct 2014 15:46:19 +0200
 

Modified: desktop/unstable/gvfs/debian/patches/dont-crash-on-null-job.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/dont-crash-on-null-job.patch?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/dont-crash-on-null-job.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/dont-crash-on-null-job.patch	[utf-8] Mon Oct 13 13:51:35 2014
@@ -2,9 +2,11 @@
 Origin: vendor, Ubuntu
 Bug-Ubuntu: LP #345754, #838464
 
---- a/daemon/gvfschannel.c
-+++ b/daemon/gvfschannel.c
-@@ -608,7 +608,8 @@
+Index: gvfs-1.22.1/daemon/gvfschannel.c
+===================================================================
+--- gvfs-1.22.1.orig/daemon/gvfschannel.c	2014-10-13 15:47:06.258335776 +0200
++++ gvfs-1.22.1/daemon/gvfschannel.c	2014-10-13 15:47:06.258335776 +0200
+@@ -603,7 +603,8 @@
  
    job = channel->priv->current_job;
    channel->priv->current_job = NULL;
@@ -14,7 +16,7 @@
  
    class = G_VFS_CHANNEL_GET_CLASS (channel);
    
-@@ -629,7 +630,7 @@
+@@ -624,7 +625,7 @@
      }
    /* Start queued request or readahead */
    else if (!start_queued_request (channel) &&

Modified: desktop/unstable/gvfs/debian/patches/handle-inactive-vfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/handle-inactive-vfs.patch?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/handle-inactive-vfs.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/handle-inactive-vfs.patch	[utf-8] Mon Oct 13 13:51:35 2014
@@ -2,9 +2,11 @@
 Origin: vendor, Ubuntu
 Bug-Ubuntu: LP #832533
 
---- a/client/gdaemonvfs.c
-+++ b/client/gdaemonvfs.c
-@@ -1449,7 +1449,7 @@
+Index: gvfs-1.22.1/client/gdaemonvfs.c
+===================================================================
+--- gvfs-1.22.1.orig/client/gdaemonvfs.c	2014-10-13 15:47:09.482390820 +0200
++++ gvfs-1.22.1/client/gdaemonvfs.c	2014-10-13 15:47:09.478390751 +0200
+@@ -1459,7 +1459,7 @@
  GDBusConnection *
  _g_daemon_vfs_get_async_bus (void)
  {

Modified: desktop/unstable/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/metadata-dont-flush-null-tree.patch?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/metadata-dont-flush-null-tree.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/metadata-dont-flush-null-tree.patch	[utf-8] Mon Oct 13 13:51:35 2014
@@ -9,11 +9,11 @@
  metadata/metatree.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
-Index: gvfs-1.16.3/metadata/metatree.c
+Index: gvfs-1.22.1/metadata/metatree.c
 ===================================================================
---- gvfs-1.16.3.orig/metadata/metatree.c	2013-06-29 09:25:23.039704009 +0200
-+++ gvfs-1.16.3/metadata/metatree.c	2013-06-29 09:25:23.031703907 +0200
-@@ -236,7 +236,7 @@
+--- gvfs-1.22.1.orig/metadata/metatree.c	2014-10-13 15:46:54.198130663 +0200
++++ gvfs-1.22.1/metadata/metatree.c	2014-10-13 15:46:54.194130594 +0200
+@@ -257,7 +257,7 @@
    if (tree->fd != -1)
      {
        close (tree->fd);
@@ -22,7 +22,7 @@
      }
  }
  
-@@ -2290,6 +2290,9 @@
+@@ -2311,6 +2311,9 @@
  
    builder = meta_builder_new ();
  

Modified: desktop/unstable/gvfs/debian/patches/metadata-nuke-junk-data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/metadata-nuke-junk-data.patch?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/metadata-nuke-junk-data.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/metadata-nuke-junk-data.patch	[utf-8] Mon Oct 13 13:51:35 2014
@@ -7,9 +7,11 @@
  metadata/metatree.c |   12 +++++++++++-
  1 files changed, 11 insertions(+), 1 deletions(-)
 
---- a/metadata/metatree.c
-+++ b/metadata/metatree.c
-@@ -397,7 +397,17 @@
+Index: gvfs-1.22.1/metadata/metatree.c
+===================================================================
+--- gvfs-1.22.1.orig/metadata/metatree.c	2014-10-13 15:47:03.322285726 +0200
++++ gvfs-1.22.1/metadata/metatree.c	2014-10-13 15:47:03.318285659 +0200
+@@ -418,7 +418,17 @@
    tree->header = (MetaFileHeader *)data;
  
    if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)

Modified: desktop/unstable/gvfs/debian/patches/ref-jobs-in-thread.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/ref-jobs-in-thread.patch?rev=43503&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/ref-jobs-in-thread.patch	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/ref-jobs-in-thread.patch	[utf-8] Mon Oct 13 13:51:35 2014
@@ -1,9 +1,11 @@
 Description: make sure to keep a ref to jobs while they run in a thread
 Origin: vendor, Ubuntu
 
---- a/daemon/gvfsdaemon.c
-+++ b/daemon/gvfsdaemon.c
-@@ -198,6 +198,7 @@
+Index: gvfs-1.22.1/daemon/gvfsdaemon.c
+===================================================================
+--- gvfs-1.22.1.orig/daemon/gvfsdaemon.c	2014-10-13 15:47:13.298456084 +0200
++++ gvfs-1.22.1/daemon/gvfsdaemon.c	2014-10-13 15:47:13.294456016 +0200
+@@ -201,6 +201,7 @@
    GVfsJob *job = G_VFS_JOB (data);
  
    g_vfs_job_run (job);
@@ -11,7 +13,7 @@
  }
  
  static void
-@@ -590,7 +591,8 @@
+@@ -593,7 +594,8 @@
    if (!g_vfs_job_try (job))
      {
        /* Couldn't finish / run async, queue worker thread */
@@ -21,7 +23,7 @@
      }
  }
  
-@@ -1058,7 +1060,8 @@
+@@ -1091,7 +1093,8 @@
  g_vfs_daemon_run_job_in_thread (GVfsDaemon *daemon,
  				GVfsJob    *job)
  {
@@ -31,9 +33,11 @@
  }
  
  void
---- a/daemon/gvfschannel.c
-+++ b/daemon/gvfschannel.c
-@@ -640,6 +640,7 @@
+Index: gvfs-1.22.1/daemon/gvfschannel.c
+===================================================================
+--- gvfs-1.22.1.orig/daemon/gvfschannel.c	2014-10-13 15:47:13.298456084 +0200
++++ gvfs-1.22.1/daemon/gvfschannel.c	2014-10-13 15:47:13.294456016 +0200
+@@ -635,6 +635,7 @@
      }
  
    g_object_unref (job);
@@ -41,7 +45,7 @@
  }
  
  /* Might be called on an i/o thread */
-@@ -663,7 +664,7 @@
+@@ -658,7 +659,7 @@
  				   channel->priv->reply_buffer,
  				   G_VFS_DAEMON_SOCKET_PROTOCOL_REPLY_SIZE,
  				   0, NULL,
@@ -50,7 +54,7 @@
      }
    else
      {
-@@ -672,7 +673,7 @@
+@@ -667,7 +668,7 @@
  				   channel->priv->output_data,
  				   channel->priv->output_data_size,
  				   0, NULL,

More information about the pkg-gnome-commits mailing list