Patchwork [meta-xfce++,2/6] exo: remove gnome-mount wrapper

login
register
mail settings
Submitter Andreas Müller
Date April 5, 2013, 11:03 p.m.
Message ID <1365203016-17804-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/47553/
State Accepted, archived
Commit 3efa3275c2c6ce563d7a7f037c5aa8e151daa30b
Headers show

Comments

Andreas Müller - April 5, 2013, 11:03 p.m.
exo-mount was removed long time ago [1]

[1] http://git.xfce.org/xfce/exo/commit/?id=5d698bf98b190d7c76a6b406bd5f542b915d0bd1

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/exo/exo/gnome-mount |   64 ----------------------------
 meta-xfce/recipes-xfce/exo/exo_0.10.2.bb   |    9 +----
 2 files changed, 1 insertions(+), 72 deletions(-)
 delete mode 100644 meta-xfce/recipes-xfce/exo/exo/gnome-mount

Patch

diff --git a/meta-xfce/recipes-xfce/exo/exo/gnome-mount b/meta-xfce/recipes-xfce/exo/exo/gnome-mount
deleted file mode 100644
index 85fdb25..0000000
--- a/meta-xfce/recipes-xfce/exo/exo/gnome-mount
+++ /dev/null
@@ -1,64 +0,0 @@ 
-#!/bin/sh
-#
-# gnome-mount - wrapper script for use with exo-mount
-#
-# Copyright 2009 Enrico Tröger <enrico(at)xfce(dot)org>
-# Licence: GPLv2
-#
-#
-# This script aims to be a wrapper script to provide the
-# gnome-mount utility on envrionments which only have
-# exo-mount (e.g. Xfce). It accepts all command line arguments
-# which are passed but ignores all which are not supported by
-# exo-mount.
-#
-# (This script was tested with Bash and Dash.)
-#
-# Possible use case is as a drop-in replacement to get mounting
-# local resources with GVfs working, e.g. mounting disks in CD drives.
-#
-# Usage:
-# Save this script as 'gnome-mount' in a directory in your path,
-# e.g. /usr/local/bin or ~/bin and make it executable.
-#
-
-
-
-OPTS=""
-
-# first catch all passed arguments and keep those exo-mount supports,
-# ignore all other arguments
-while [ -n "$*" ]
-do
-	case $1 in
-		-\?|--help)
-		OPTS="$OPTS --help"
-		;;
-		-e|--eject)
-		OPTS="$OPTS --eject"
-		;;
-		-u|--unmount)
-		OPTS="$OPTS --unmount"
-		;;
-		-h|--hal-udi)
-		OPTS="$OPTS --hal-udi"
-		shift
-		OPTS="$OPTS $1"
-		;;
-		-d|--device)
-		OPTS="$OPTS --device"
-		shift
-		OPTS="$OPTS $1"
-		;;
-		-n|--no-ui)
-		OPTS="$OPTS --no-ui"
-		;;
-		-V|--version)
-		OPTS="$OPTS --version"
-		;;
-	esac
-	shift
-done
-
-# now run exo-mount and hope things go well
-exo-mount $OPTS
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
index ff529db..5e6b5ac 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
@@ -4,7 +4,7 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo"
 DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native"
-PR = "r3"
+PR = "r4"
 
 inherit xfce pythonnative perlnative
 
@@ -12,7 +12,6 @@  inherit xfce pythonnative perlnative
 SRC_URI += " \
     file://exo-no-tests-0.8.patch \
     file://configure.patch \
-    file://gnome-mount \
 "
 
 SRC_URI_append_class-native = " \
@@ -22,12 +21,6 @@  SRC_URI_append_class-native = " \
 SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
 SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
 
-# see http://wiki.xfce.org/gnomemount-replacement
-do_install_append () {
-	install -m 755 -d ${D}${bindir}/exo-mount-wrapper
-	install -m 755 ${WORKDIR}//gnome-mount ${D}${bindir}/exo-mount-wrapper
-}
-
 PACKAGES =+ "exo-csource"
 
 # Note: python bindings did not work in oe-dev and are about to be moved to