[maemo-commits] [maemo-commits] r18281 - in projects/haf/branches/glib/glib-2-20/debian: . patches

Thu May 7 14:04:09 EEST 2009

Author: csaavedra
Date: 2009-05-07 14:04:08 +0300 (Thu, 07 May 2009)
New Revision: 18281

Removed:
   projects/haf/branches/glib/glib-2-20/debian/patches/20-gunixmount.patch
   projects/haf/branches/glib/glib-2-20/debian/patches/55-gsignal.patch
Modified:
   projects/haf/branches/glib/glib-2-20/debian/changelog
   projects/haf/branches/glib/glib-2-20/debian/patches/series
Log:
Drop patches applied upstream.


Modified: projects/haf/branches/glib/glib-2-20/debian/changelog
===================================================================

--- projects/haf/branches/glib/glib-2-20/debian/changelog	2009-05-07 10:59:57 UTC (rev 18280)
+++ projects/haf/branches/glib/glib-2-20/debian/changelog	2009-05-07 11:04:08 UTC (rev 18281)
@@ -6,6 +6,9 @@
   [ Claudio Saavedra ]
   * Drop debian unstable patches.
   * Remove patches with autogenerated documentation.
+  * Drop patches applied upstream:
+    + 20-gunixmount.patch, dropped.
+    + 55-gsignal.patch, dropped.
 
  -- Claudio Saavedra <csaavedra at igalia.com>  Thu, 07 May 2009 13:58:09 +0300
 

Deleted: projects/haf/branches/glib/glib-2-20/debian/patches/20-gunixmount.patch
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/patches/20-gunixmount.patch	2009-05-07 10:59:57 UTC (rev 18280)
+++ projects/haf/branches/glib/glib-2-20/debian/patches/20-gunixmount.patch	2009-05-07 11:04:08 UTC (rev 18281)
@@ -1,88 +0,0 @@
---- glib-2.18.1/gio/gunixmount.c	2008-09-18 01:33:49.000000000 +0300
-+++ glib/gio/gunixmount.c	2009-04-28 09:16:21.000000000 +0300
-@@ -242,6 +242,7 @@ typedef struct {
-   GIOChannel *error_channel;
-   guint error_channel_source_id;
-   GString *error_string;
-+  gchar **argv;
- } UnmountEjectOp;
- 
- static void 
-@@ -276,6 +277,7 @@ eject_unmount_cb (GPid pid, gint status,
-   g_source_remove (data->error_channel_source_id);
-   g_io_channel_unref (data->error_channel);
-   g_string_free (data->error_string, TRUE);
-+  g_strfreev (data->argv);
-   close (data->error_fd);
-   g_spawn_close_pid (pid);
-   g_free (data);
-@@ -316,27 +318,15 @@ read:
-   return TRUE;
- }
- 
--static void
--eject_unmount_do (GMount              *mount,
--                  GCancellable        *cancellable,
--                  GAsyncReadyCallback  callback,
--                  gpointer             user_data,
--                  char               **argv)
-+static gboolean
-+eject_unmount_do_cb (gpointer user_data)
- {
--  GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
--  UnmountEjectOp *data;
-+  UnmountEjectOp *data = (UnmountEjectOp *) user_data;
-   GPid child_pid;
--  GError *error;
--  
--  data = g_new0 (UnmountEjectOp, 1);
--  data->unix_mount = unix_mount;
--  data->callback = callback;
--  data->user_data = user_data;
--  data->cancellable = cancellable;
--  
--  error = NULL;
-+  GError *error = NULL;
-+
-   if (!g_spawn_async_with_pipes (NULL,         /* working dir */
--                                 argv,
-+                                 data->argv,
-                                  NULL,         /* envp */
-                                  G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
-                                  NULL,         /* child_setup */
-@@ -376,9 +366,35 @@ handle_error:
-     if (data->error_channel != NULL)
-       g_io_channel_unref (data->error_channel);
- 
-+    g_strfreev (data->argv);
-     g_error_free (error);
-     g_free (data);
-   }
-+
-+  return FALSE;
-+}
-+
-+static void
-+eject_unmount_do (GMount              *mount,
-+                  GCancellable        *cancellable,
-+                  GAsyncReadyCallback  callback,
-+                  gpointer             user_data,
-+                  char               **argv)
-+{
-+  GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
-+  UnmountEjectOp *data;
-+
-+  data = g_new0 (UnmountEjectOp, 1);
-+  data->unix_mount = unix_mount;
-+  data->callback = callback;
-+  data->user_data = user_data;
-+  data->cancellable = cancellable;
-+  data->argv = g_strdupv (argv);
-+
-+  if (unix_mount->volume_monitor != NULL)
-+    g_signal_emit_by_name (unix_mount->volume_monitor, "mount-pre-unmount", mount);
-+
-+  g_timeout_add (500, (GSourceFunc) eject_unmount_do_cb, data);
- }
- 
- static void

Deleted: projects/haf/branches/glib/glib-2-20/debian/patches/55-gsignal.patch
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/patches/55-gsignal.patch	2009-05-07 10:59:57 UTC (rev 18280)
+++ projects/haf/branches/glib/glib-2-20/debian/patches/55-gsignal.patch	2009-05-07 11:04:08 UTC (rev 18281)
@@ -1,18 +0,0 @@
---- glib-2.18.1/gobject/gsignal.c	2008-09-18 01:33:53.000000000 +0300
-+++ glib/gobject/gsignal.c	2009-04-28 09:16:36.000000000 +0300
-@@ -1448,9 +1448,12 @@ signal_lookup_closure (SignalNode    *no
-   ClassClosure *cc;
- 
-   if (node->class_closure_bsa && g_bsearch_array_get_n_nodes (node->class_closure_bsa) == 1)
--    cc = g_bsearch_array_get_nth (node->class_closure_bsa, &g_class_closure_bconfig, 0);
--  else
--    cc = signal_find_class_closure (node, G_TYPE_FROM_INSTANCE (instance));
-+    {
-+      cc = g_bsearch_array_get_nth (node->class_closure_bsa, &g_class_closure_bconfig, 0);
-+      if (cc && cc->instance_type == 0) /* check for default closure */
-+        return cc->closure;
-+    }
-+  cc = signal_find_class_closure (node, G_TYPE_FROM_INSTANCE (instance));
-   return cc ? cc->closure : NULL;
- }
- 

Modified: projects/haf/branches/glib/glib-2-20/debian/patches/series
===================================================================
--- projects/haf/branches/glib/glib-2-20/debian/patches/series	2009-05-07 10:59:57 UTC (rev 18280)
+++ projects/haf/branches/glib/glib-2-20/debian/patches/series	2009-05-07 11:04:08 UTC (rev 18281)
@@ -1,9 +1,7 @@
 60_wait-longer-for-threads-to-die.patch
-20-gunixmount.patch
 25-gatomic.patch
 30-gfileutils.patch
 35-gmessages.patch
 40-gscanner.patch
 45-gunicode.patch
 50-gthread.patch
-55-gsignal.patch


