Add upstream patch for ejecting.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 264 insertions, 3 deletions

diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog
index 3e1849bd9c9d..abaa14b3c939 100644
--- a/xfce-base/exo/ChangeLog
+++ b/xfce-base/exo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/exo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.10 2009/10/09 15:11:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.11 2009/10/09 19:51:33 darkside Exp $
+
+*exo-0.3.103-r1 (09 Oct 2009)
+
+  09 Oct 2009; Jeremy Olexa <darkside@gentoo.org> -exo-0.3.103.ebuild,
+  +exo-0.3.103-r1.ebuild, +files/exo-eject-upstream_patch.patch:
+  Add upstream patch for ejecting.
 
 *exo-0.3.103 (09 Oct 2009)
 
diff --git a/xfce-base/exo/exo-0.3.103.ebuild b/xfce-base/exo/exo-0.3.103-r1.ebuild
index c211ce950745..55ba0b2816e4 100644
--- a/xfce-base/exo/exo-0.3.103.ebuild
+++ b/xfce-base/exo/exo-0.3.103-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.103.ebuild,v 1.1 2009/10/09 15:11:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.3.103-r1.ebuild,v 1.1 2009/10/09 19:51:33 darkside Exp $
 
 EAPI=2
 inherit xfconf python multilib
@@ -32,7 +32,8 @@ pkg_setup() {
 		$(use_enable libnotify notifications)
 		$(use_enable python)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-	PATCHES=( "${FILESDIR}/${PN}-0.3.4-interix.patch" )
+	PATCHES=( "${FILESDIR}/${PN}-eject-upstream_patch.patch"
+		"${FILESDIR}/${PN}-0.3.4-interix.patch" )
 }
 
 src_prepare() {
diff --git a/xfce-base/exo/files/exo-eject-upstream_patch.patch b/xfce-base/exo/files/exo-eject-upstream_patch.patch
new file mode 100644
index 000000000000..b7b85d2e26b6
--- /dev/null
+++ b/xfce-base/exo/files/exo-eject-upstream_patch.patch
@@ -0,0 +1,254 @@
+http://git.xfce.org/xfce/exo/commit/?id=42d4c9befb7e32d4675976093c435fc198977d95
+
+commit 42d4c9befb7e32d4675976093c435fc198977d95
+Author: Nick Schermer <nick@xfce.org>
+Date:   Fri Oct 9 20:55:10 2009 +0200
+
+    Make unmount work for devices that have a parent that is a volume (bug #2968).
+    
+    When a device had interfaces, but none of them was a volume, we
+    simply failed with an error without checking if the device
+    has parents that had his capability.
+    
+    Put the looping code in functions instead of a bunch gotos,
+    to make the whole thing easier to understand.
+
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index d5be8fa..f4a58b2 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -147,6 +147,88 @@ exo_mount_hal_propagate_error (GError   **error,
+ 
+ 
+ 
++static gint
++exo_mount_hal_udi_is_volume (const gchar  *udi,
++                             GError      **error)
++{
++  gchar     **interfaces;
++  DBusError   derror;
++  guint       n;
++  gint        is_volume = -1;
++
++  g_return_val_if_fail (udi != NULL, -1);
++  g_return_val_if_fail (error == NULL || *error == NULL, -1);
++
++  /* initialize D-Bus error */
++  dbus_error_init (&derror);
++
++  /* determine the info.interfaces property of the device */
++  interfaces = libhal_device_get_property_strlist (hal_context, udi, "info.interfaces", &derror);
++  if (G_LIKELY (interfaces != NULL))
++    {
++      /* verify that we have a mountable device here */
++      for (is_volume = 0, n = 0; is_volume == 0 && interfaces[n] != NULL; ++n)
++        if (strcmp (interfaces[n], "org.freedesktop.Hal.Device.Volume") == 0)
++          is_volume = 1;
++      libhal_free_string_array (interfaces);
++    }
++  else
++    {
++      exo_mount_hal_propagate_error (error, &derror);
++    }
++
++  return is_volume;
++}
++
++
++
++static gchar *
++exo_mount_hal_get_volume_udi (const gchar  *udi,
++                              GError      **error)
++{
++  DBusError  derror;
++  gint       result;
++  gchar     *volume_udi = NULL;
++  gchar    **parent_udis;
++  gint       n, n_parent_udis;
++
++  g_return_val_if_fail (udi != NULL, NULL);
++  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
++
++  result = exo_mount_hal_udi_is_volume (udi, error);
++  if (G_LIKELY (result == 1))
++    {
++      /* this udi is a valid volume */
++      volume_udi = g_strdup (udi);
++    }
++  else if (result == 0)
++    {
++      /* initialize D-Bus error */
++      dbus_error_init (&derror);
++
++      /* ok, but maybe we have a volume whose parent is identified by the udi */
++      parent_udis = libhal_manager_find_device_string_match (hal_context, "info.parent", udi, &n_parent_udis, &derror);
++      if (G_LIKELY (parent_udis != NULL))
++        {
++          for (n = 0; n < n_parent_udis; n++)
++            {
++              /* check if this udi is a volume, or one of its parents */
++              volume_udi = exo_mount_hal_get_volume_udi (parent_udis[n], error);
++              if (volume_udi != NULL || *error != NULL)
++                break;
++            }
++        }
++      else
++        {
++          exo_mount_hal_propagate_error (error, &derror);
++        }
++    }
++
++  return volume_udi;
++}
++
++
++
+ /**
+  * exo_mount_hal_device_from_udi:
+  * @udi   : UDI of a volume or drive.
+@@ -164,11 +246,7 @@ exo_mount_hal_device_from_udi (const gchar *udi,
+ {
+   ExoMountHalDevice *device = NULL;
+   DBusError          derror;
+-  gchar            **interfaces;
+-  gchar            **volume_udis;
+-  gchar             *volume_udi = NULL;
+-  gint               n_volume_udis;
+-  gint               n;
++  gchar             *volume_udi;
+   gchar             *key;
+ 
+   g_return_val_if_fail (udi != NULL, NULL);
+@@ -178,61 +256,20 @@ exo_mount_hal_device_from_udi (const gchar *udi,
+   if (!exo_mount_hal_init (error))
+     return NULL;
+ 
+-  /* initialize D-Bus error */
+-  dbus_error_init (&derror);
+-
+-again:
+-  /* determine the info.interfaces property of the device */
+-  interfaces = libhal_device_get_property_strlist (hal_context, udi, "info.interfaces", &derror);
+-  if (G_UNLIKELY (interfaces == NULL))
+-    {
+-      /* reset D-Bus error */
+-      dbus_error_free (&derror);
+-
+-      /* release any previous volume UDI */
+-      g_free (volume_udi);
+-      volume_udi = NULL;
+-
+-      /* ok, but maybe we have a volume whose parent is identified by the udi */
+-      volume_udis = libhal_manager_find_device_string_match (hal_context, "info.parent", udi, &n_volume_udis, &derror);
+-      if (G_UNLIKELY (volume_udis == NULL))
+-        {
+-err0:     exo_mount_hal_propagate_error (error, &derror);
+-          goto out;
+-        }
+-      else if (G_UNLIKELY (n_volume_udis < 1))
+-        {
+-          /* no match, we cannot handle that device */
+-          libhal_free_string_array (volume_udis);
+-          goto err1;
+-        }
+-
+-      /* use the first volume UDI... */
+-      volume_udi = g_strdup (volume_udis[0]);
+-      libhal_free_string_array (volume_udis);
+-
+-      /* ..and try again using that UDI */
+-      udi = (const gchar *) volume_udi;
+-      goto again;
+-    }
+-
+-  /* verify that we have a mountable device here */
+-  for (n = 0; interfaces[n] != NULL; ++n)
+-    if (strcmp (interfaces[n], "org.freedesktop.Hal.Device.Volume") == 0)
+-      break;
+-  if (G_UNLIKELY (interfaces[n] == NULL))
++  /* find the volume udi for this udi (either this udi or one of its parents) */
++  volume_udi = exo_mount_hal_get_volume_udi (udi, error);
++  if (G_UNLIKELY (volume_udi == NULL))
+     {
+-      /* definitely not a device that we're able to mount, eject or unmount */
+-err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
+-      goto out;
++err0: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
++      return NULL;
+     }
+ 
+   /* setup the device struct */
+   device = g_new0 (ExoMountHalDevice, 1);
+-  device->udi = g_strdup (udi);
++  device->udi = volume_udi;
+ 
+   /* check if we have a volume here */
+-  device->volume = libhal_volume_from_udi (hal_context, udi);
++  device->volume = libhal_volume_from_udi (hal_context, device->udi);
+   if (G_LIKELY (device->volume != NULL))
+     {
+       /* determine the storage drive for the volume */
+@@ -245,14 +282,14 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
+ 
+           /* setup the file system internals */
+           device->fstype = libhal_volume_get_fstype (device->volume);
+-          device->altfstype = libhal_device_get_property_string (hal_context, udi, "volume.fstype.alternative.preferred", NULL);
++          device->altfstype = libhal_device_get_property_string (hal_context, device->udi, "volume.fstype.alternative.preferred", NULL);
+           device->fsusage = libhal_volume_get_fsusage (device->volume);
+         }
+     }
+   else
+     {
+       /* check if we have a drive here (i.e. floppy) */
+-      device->drive = libhal_drive_from_udi (hal_context, udi);
++      device->drive = libhal_drive_from_udi (hal_context, device->udi);
+       if (G_LIKELY (device->drive != NULL))
+         {
+           /* setup the device internals */
+@@ -265,23 +302,25 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
+         }
+     }
+ 
++  /* initialize D-Bus error */
++  dbus_error_init (&derror);
++
+   /* determine the valid mount options from the UDI */
+   if (device->altfstype != NULL)
+     {
+       key = g_strdup_printf ("volume.mount.%s.valid_options", device->altfstype);
+-      device->fsoptions = libhal_device_get_property_strlist (hal_context, udi, key, &derror);
++      device->fsoptions = libhal_device_get_property_strlist (hal_context, device->udi, key, &derror);
+       g_free (key);
+     }
+   else
+     {
+-      device->fsoptions = libhal_device_get_property_strlist (hal_context, udi, "volume.mount.valid_options", &derror);
++      device->fsoptions = libhal_device_get_property_strlist (hal_context, device->udi, "volume.mount.valid_options", &derror);
+     }
+ 
+   /* sanity checking */
+   if (G_UNLIKELY (device->file == NULL || device->name == NULL))
+     {
+       exo_mount_hal_device_free (device);
+-      device = NULL;
+       goto err0;
+     }
+ 
+@@ -289,16 +328,11 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
+   if (G_LIKELY (device->drive == NULL))
+     {
+       /* definitely not a device that we're able to mount, eject or unmount */
+-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
++      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), device->udi);
+       exo_mount_hal_device_free (device);
+       device = NULL;
+     }
+ 
+-out:
+-  /* cleanup */
+-  libhal_free_string_array (interfaces);
+-  g_free (volume_udi);
+-
+   return device;
+ }
+