From 6e6cb4abe41159b887b71ef6d76f8baa7803a400 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 10 Aug 2005 21:32:49 +0000 Subject: [PATCH] - Disable a few patches that are upstream/irrelavant - Add patch to detect mounts from drives we cannot poll --- ...andle-drives-without-media-detection.patch | 32 +++++++++++++++++++ gnome-vfs2.spec | 16 +++++++--- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 gnome-vfs-handle-drives-without-media-detection.patch diff --git a/gnome-vfs-handle-drives-without-media-detection.patch b/gnome-vfs-handle-drives-without-media-detection.patch new file mode 100644 index 0000000..6486369 --- /dev/null +++ b/gnome-vfs-handle-drives-without-media-detection.patch @@ -0,0 +1,32 @@ +Index: libgnomevfs/gnome-vfs-hal-mounts.c +=================================================================== +RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v +retrieving revision 1.15 +diff -u -p -r1.15 gnome-vfs-hal-mounts.c +--- libgnomevfs/gnome-vfs-hal-mounts.c 23 Jul 2005 22:28:15 -0000 1.15 ++++ libgnomevfs/gnome-vfs-hal-mounts.c 10 Aug 2005 20:50:50 -0000 +@@ -1475,6 +1475,24 @@ _gnome_vfs_hal_mounts_modify_volume (Gno + */ + hal_drive = libhal_drive_from_device_file (hal_ctx, volume->priv->device_path); + if (hal_drive != NULL) { ++ ++ /* handle drives that HAL can't poll and the user can still mount */ ++ if (libhal_device_get_property_bool (hal_ctx, ++ libhal_drive_get_udi (hal_drive), ++ "storage.media_check_enabled", ++ NULL) == FALSE) { ++ GnomeVFSDrive *drive; ++ ++ if ((drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi ( ++ GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon), ++ libhal_drive_get_udi (hal_drive))) != NULL) { ++ volume->priv->drive = drive; ++ _gnome_vfs_drive_add_mounted_volume (drive, volume); ++ ++ goto out; ++ } ++ } ++ + /* ok, this device file is in HAL and thus managed by this backend */ + gnome_vfs_volume_unref (volume); + result = NULL; diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index 32c8292..d464d5c 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.11.90 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -46,10 +46,11 @@ Patch104: gnome-vfs-2.8.2-browser_default.patch Patch201: gnome-vfs-2.8.1-console-mount-opt.patch # send to upstream -Patch202: gnome-vfs-2.9.91-hal-api-2.patch +#Patch202: gnome-vfs-2.9.91-hal-api-2.patch +Patch203: gnome-vfs-handle-drives-without-media-detection.patch # possible gcc4 bug -Patch300: gnome-vfs-2.9.91-fix-gcc4-build.patch +#Patch300: gnome-vfs-2.9.91-fix-gcc4-build.patch # Bug 150132 Patch400: neon-0.24.7-gssapi.patch @@ -99,9 +100,10 @@ shares (SMB) to applications using GNOME VFS. %patch201 -p0 -b .console #send to upstream -%patch202 -p0 -b .hal-api2 +#%patch202 -p0 -b .hal-api2 +%patch203 -p0 -b .hal-handle-drives-without-media-detection.patch -%patch300 -p0 -b .gcc4-build +#%patch300 -p0 -b .gcc4-build %patch400 -p0 -b .neon-gssapi @@ -182,6 +184,10 @@ done %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Aug 10 2005 David Zeuthen 2.11.90-2 +- Disable a few patches that are upstream/irrelavant +- Add patch to detect mounts from drives we cannot poll + * Fri Aug 5 2005 Matthias Clasen 2.11.90-1 - New upstream version - Remove patches and sources for the desktop method, since