rm unused patch

(Portage version: 2.1.6.13/cvs/Linux x86_64)

2 files changed, 0 insertions, 255 deletions

diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 535346067e1f..58adee8e56d8 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,7 +1,6 @@
 AUX exo-0.3.101-iocharset.patch 2052 RMD160 aad5f5b78fa01b9bf13cad9013ee99fb468f8bee SHA1 8b9c68550e090f91a653ef3f4b4a4931f8e92469 SHA256 d3e2b5fb2d012d6f9dddf3da5f350fc81a3d61c1a66eca7638d7c14a9b282769
 AUX exo-0.3.102-eject.patch 6770 RMD160 1e6fb5f55e01b4c0319a1c1a35919806b3caf817 SHA1 adefb1e320a9b56eff699d9f23b202d78cc2750f SHA256 84e2f7d3f796cb6596c3b88d6e05c286afc70ae3b326756ba8d86895521fe044
 AUX exo-0.3.4-interix.patch 2766 RMD160 876452cf6009fb1530cf0f296104ba4105dc10de SHA1 8ad881d9cca3811fba0b1a7080caed024e37381b SHA256 e7a5864241cbae1ac1442af31aea2b3365e9936740954e06a45e4da7e810e471
-AUX exo-eject-upstream_patch.patch 8880 RMD160 8a6283a8df463b23309e2fcc76a41ff17a120db3 SHA1 5a73518e7be3def0db993282ebba1bafbb7c4dc0 SHA256 8a7ce08f69b5bd43b6940f324fae265895983f1ae4a3ca6f2afb8dfbe3bb3aab
 DIST exo-0.3.102.tar.bz2 1801655 RMD160 a932173cb916ea18e62fdc8f0254452ab09ac320 SHA1 ef85488a713911d1afeea5ddd8d70943f2c5a323 SHA256 deab87326a455fc47eea44a124268fa64b154750a55ae5158a1119cddc497800
 DIST exo-0.3.104.tar.bz2 1706606 RMD160 b35382e24333e88fe861675988cbb4698f2e2362 SHA1 ddd49dc4efd32697c195f2790c8459b5f2b7e624 SHA256 3cb2f23bd313be45ae2cfc2d05c931a18d9be0e591e0fbd38e0da35a74b53b13
 EBUILD exo-0.3.102-r1.ebuild 1653 RMD160 0dcf1a0f9aaf8a3dfd32b744345e3d1385b1513f SHA1 71b4c25dd36add139c0a9b7c2a3cd77bcab573cc SHA256 cb6cde6ce12499be4e9e073c43e2f3b8c7df9a72cf6b59bbdb8665e5a1f5c5ba
diff --git a/xfce-base/exo/files/exo-eject-upstream_patch.patch b/xfce-base/exo/files/exo-eject-upstream_patch.patch
deleted file mode 100644
index b7b85d2e26b6..000000000000
--- a/xfce-base/exo/files/exo-eject-upstream_patch.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-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;
- }
-