Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=478067da78ed525981cca64928c3e8cc7cd93ba0
commit 478067da78ed525981cca64928c3e8cc7cd93ba0 Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Jan 27 21:55:43 2011 +0100 gnome-mount *dead pkg gvfs replaces it diff --git a/source/gnome/gnome-mount/FrugalBuild b/source/gnome/gnome-mount/FrugalBuild deleted file mode 100644 index 0426732..0000000 --- a/source/gnome/gnome-mount/FrugalBuild +++ /dev/null @@ -1,38 +0,0 @@ -# Compiling time: 0.11 SBU -# Maintainer: bouleetbil <bouleet...@frogdev.info> - -pkgname=gnome-mount -pkgver=0.8 -pkgrel=3 -pkgdesc="Programs for mounting, unmounting and ejecting storage devices." -url="http://www.gnome.org"; -depends=('gtk+2>=2.20.0-2' 'gnome-keyring>=2.30.0-2' 'hal>=0.5.9' 'libbonobo' 'libnotify>=0.4.5-2' 'libglade') -makedepends=('perl-xml-parser' 'intltool' 'nautilus>=2.30.0-2') -groups=('gnome' 'gnome-minimal') -archs=('i686' 'x86_64' 'ppc') -source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ - gnome-mount-0.6-default-mount-options.patch fstablock.diff) -up2date="Flasttar http://hal.freedesktop.org/releases/"; -_F_gnome_schemas=('/etc/gconf/schemas/gnome-mount.schemas') -Finclude gnome-scriptlet -sha1sums=('846ba178cf9009f3e32c7f55f912b3ca6b9ecedb' \ - 'f5e2d09503c12b61f33f54969256189eee2111b4' \ - '90248972a943b26d4ac9520faee99513dabbdb64') -Fconfopts="$Fconfopts --enable-nautilus-extension" - -subpkgs=('gnome-mount-nautilus') -subdescs=('Nautilus extension for gnome-mount') -subdepends=("$pkgname=$pkgver nautilus>=2.18.1") -subgroups=('gnome') -subarchs=('i686 x86_64 ppc') - -build() { - Fbuild - - Fbuild_gnome_scriptlet - - Fsplit gnome-mount-nautilus usr/lib/nautilus - Fsplit gnome-mount-nautilus usr/share/gnome-mount/gnome-mount-properties.glade -} - -# optimization OK diff --git a/source/gnome/gnome-mount/fstablock.diff b/source/gnome/gnome-mount/fstablock.diff deleted file mode 100644 index c7254e0..0000000 --- a/source/gnome/gnome-mount/fstablock.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff -p -up gnome-mount-0.8/src/gnome-mount.c.lock gnome-mount-0.8/src/gnome-mount.c ---- gnome-mount-0.8/src/gnome-mount.c.lock 2008-09-15 14:39:28.000000000 +0200 -+++ gnome-mount-0.8/src/gnome-mount.c 2008-09-15 14:42:54.000000000 +0200 -@@ -1166,6 +1166,18 @@ volume_mount (const char *udi, LibHalVol - char *args[3] = {MOUNT, NULL, NULL}; - char **envp = {NULL}; - -+ /* don't mount if device is locked -+ */ -+ if (libhal_device_is_locked_by_others (hal_ctx, -+ udi, -+ "org.freedesktop.Hal.Device.Storage", -+ NULL)) { -+ if (opt_verbose) -+ g_message (_("Device %s is locked, aborting"), -+ udi); -+ goto out; -+ } -+ - if (opt_verbose) - g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), - device_file, mount_point_fstab); -@@ -1738,6 +1750,17 @@ volume_unmount (const char *udi, LibHalV - char *args[3] = {UMOUNT, NULL, NULL}; - char **envp = {NULL}; - -+ /* don't unmount if device is locked -+ */ -+ if (libhal_device_is_locked_by_others (hal_ctx, -+ udi, -+ "org.freedesktop.Hal.Device.Storage", -+ NULL)) { -+ if (opt_verbose) -+ g_message (_("Device %s is locked, aborting"), -+ udi); -+ goto out; -+ } - if (opt_verbose) - g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), - device_file, mount_point); -@@ -1958,6 +1981,18 @@ volume_eject (const char *udi, LibHalVol - char *args[3] = {"eject", NULL, NULL}; - char **envp = {NULL}; - -+ /* don't mount if device is locked -+ */ -+ if (libhal_device_is_locked_by_others (hal_ctx, -+ udi, -+ "org.freedesktop.Hal.Device.Storage", -+ NULL)) { -+ if (opt_verbose) -+ g_message (_("Device %s is locked, aborting"), -+ udi); -+ goto out; -+ } -+ - if (opt_verbose) - g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), - device_file, mount_point); - diff --git a/source/gnome/gnome-mount/gnome-mount-0.6-default-mount-options.patch b/source/gnome/gnome-mount/gnome-mount-0.6-default-mount-options.patch deleted file mode 100644 index 16c11d3..0000000 --- a/source/gnome/gnome-mount/gnome-mount-0.6-default-mount-options.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -urN gnome-mount-0.6.orig/gnome-mount.schemas.in gnome-mount-0.6/gnome-mount.schemas.in ---- gnome-mount-0.6.orig/gnome-mount.schemas.in 2007-04-11 18:34:17.000000000 +0100 -+++ gnome-mount-0.6/gnome-mount.schemas.in 2007-04-11 18:34:36.000000000 +0100 -@@ -6,7 +6,7 @@ - <applyto>/system/storage/default_options/vfat/mount_options</applyto> - <type>list</type> - <list_type>string</list_type> -- <default>[shortname=lower,uid=]</default> -+ <default>[shortname=mixed,uid=,umask=077,exec]</default> - <locale name="C"> - <short>Default mount options for vfat fs</short> - <long>A list of default mount options for volumes formatted with the vfat file system.</long> -@@ -18,7 +18,7 @@ - <applyto>/system/storage/default_options/iso9660/mount_options</applyto> - <type>list</type> - <list_type>string</list_type> -- <default>[uid=]</default> -+ <default>[uid=,exec]</default> - <locale name="C"> - <short>Default mount options for iso9660 fs</short> - <long>A list of default mount options for volumes formatted with the iso9660 file system.</long> -@@ -30,7 +30,7 @@ - <applyto>/system/storage/default_options/udf/mount_options</applyto> - <type>list</type> - <list_type>string</list_type> -- <default>[uid=]</default> -+ <default>[uid=,exec]</default> - <locale name="C"> - <short>Default mount options for udf fs</short> - <long>A list of default mount options for volumes formatted with the udf file system.</long> -@@ -42,7 +42,7 @@ - <applyto>/system/storage/default_options/ntfs/mount_options</applyto> - <type>list</type> - <list_type>string</list_type> -- <default>[umask=222]</default> -+ <default>[umask=222,exec]</default> - <locale name="C"> - <short>Default mount options for ntfs fs</short> - <long>A list of default mount options for volumes formatted with the ntfs file system.</long> -@@ -52,7 +52,7 @@ - <key>/schemas/system/storage/default_options/ntfs/fstype_override</key> - <applyto>/system/storage/default_options/ntfs/fstype_override</applyto> - <type>string</type> -- <default>ntfs-3g</default> -+ <default>ntfs</default> - <locale name="C"> - <short>When 'ntfs' is detected, what file system driver to use by default</short> - <long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long> -@@ -64,7 +64,7 @@ - <applyto>/system/storage/default_options/ntfs-3g/mount_options</applyto> - <type>list</type> - <list_type>string</list_type> -- <default>[locale=]</default> -+ <default>[locale=,exec]</default> - <locale name="C"> - <short>Default mount options for ntfs-3g fs</short> - <long>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</long> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
