From 60f66e3fb8520616da13abeb962c3d73ae0aac19 Mon Sep 17 00:00:00 2001 From: Thierry N Date: Fri, 21 Aug 2009 22:49:29 +0200 Subject: Ajout de exo#0.3.101-2 --- xfce/exo/.footprint | 250 +++++++++++++++++++++++++++++++++++++++ xfce/exo/.md5sum | 3 + xfce/exo/Pkgfile | 28 +++++ xfce/exo/exo-alt-eject.patch | 207 ++++++++++++++++++++++++++++++++ xfce/exo/exo-mount-options.patch | 41 +++++++ 5 files changed, 529 insertions(+) create mode 100644 xfce/exo/.footprint create mode 100644 xfce/exo/.md5sum create mode 100755 xfce/exo/Pkgfile create mode 100755 xfce/exo/exo-alt-eject.patch create mode 100755 xfce/exo/exo-mount-options.patch diff --git a/xfce/exo/.footprint b/xfce/exo/.footprint new file mode 100644 index 000000000..8fcfe97e6 --- /dev/null +++ b/xfce/exo/.footprint @@ -0,0 +1,250 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/xfce4/ +-rw-r--r-- root/root etc/xdg/xfce4/helpers.rc +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/exo-csource +-rwxr-xr-x root/root usr/bin/exo-desktop-item-edit +lrwxrwxrwx root/root usr/bin/exo-eject -> exo-mount +-rwxr-xr-x root/root usr/bin/exo-mount +-rwxr-xr-x root/root usr/bin/exo-open +-rwxr-xr-x root/root usr/bin/exo-preferred-applications +lrwxrwxrwx root/root usr/bin/exo-unmount -> exo-mount +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/exo-0.3/ +drwxr-xr-x root/root usr/include/exo-0.3/exo-hal/ +-rw-r--r-- root/root usr/include/exo-0.3/exo-hal/exo-hal.h +drwxr-xr-x root/root usr/include/exo-0.3/exo/ +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-binding.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-cell-renderer-icon.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-config.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-ellipsized-label.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-enum-types.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-execute.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-gobject-extensions.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-gtk-extensions.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-icon-bar.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-icon-chooser-dialog.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-icon-view.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-md5.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-mount-point.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-pango-extensions.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-string.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-toolbars-editor-dialog.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-toolbars-editor.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-toolbars-model.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-toolbars-view.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-tree-view.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-url.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-utils.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-wrap-table.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo-xsession-client.h +-rw-r--r-- root/root usr/include/exo-0.3/exo/exo.h +drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libexo-0.3.la +lrwxrwxrwx root/root usr/lib/libexo-0.3.so -> libexo-0.3.so.0.5.0 +lrwxrwxrwx root/root usr/lib/libexo-0.3.so.0 -> libexo-0.3.so.0.5.0 +-rwxr-xr-x root/root usr/lib/libexo-0.3.so.0.5.0 +-rwxr-xr-x root/root usr/lib/libexo-hal-0.3.la +lrwxrwxrwx root/root usr/lib/libexo-hal-0.3.so -> libexo-hal-0.3.so.0.5.0 +lrwxrwxrwx root/root usr/lib/libexo-hal-0.3.so.0 -> libexo-hal-0.3.so.0.5.0 +-rwxr-xr-x root/root usr/lib/libexo-hal-0.3.so.0.5.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/exo-0.3.pc +-rw-r--r-- root/root usr/lib/pkgconfig/exo-hal-0.3.pc +drwxr-xr-x root/root usr/lib/python2.6/ +drwxr-xr-x root/root usr/lib/python2.6/site-packages/ +drwxr-xr-x root/root usr/lib/python2.6/site-packages/exo-0.3/ +-rwxr-xr-x root/root usr/lib/python2.6/site-packages/exo-0.3/_exo.la +-rwxr-xr-x root/root usr/lib/python2.6/site-packages/exo-0.3/_exo.so +drwxr-xr-x root/root usr/lib/python2.6/site-packages/exo-0.3/exo/ +-rw-r--r-- root/root usr/lib/python2.6/site-packages/exo-0.3/exo/__init__.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/exo-0.3/exo/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/exo-0.3/exo/__init__.pyo +-rw-r--r-- root/root usr/lib/python2.6/site-packages/pyexo.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/pyexo.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/pyexo.pyo +drwxr-xr-x root/root usr/lib/xfce4/ +-rwxr-xr-x root/root usr/lib/xfce4/exo-compose-mail-0.3 +-rwxr-xr-x root/root usr/lib/xfce4/exo-helper-0.3 +-rwxr-xr-x root/root usr/lib/xfce4/exo-mount-notify-0.3 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/exo-preferred-applications.desktop +drwxr-xr-x root/root usr/share/gtk-doc/ +drwxr-xr-x root/root usr/share/gtk-doc/html/ +drwxr-xr-x root/root usr/share/gtk-doc/html/exo/ +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoCellRendererIcon.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoEllipsizedLabel.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoIconBar.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoIconChooserDialog.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoIconView.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoToolbarsEditor.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoToolbarsModel.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoToolbarsView.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoTreeView.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoWrapTable.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ExoXsessionClient.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ch01.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Executing-Applications.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Extensions-to-GObject.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Extensions-to-Pango.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-HAL-Support-Functions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-MD5-functions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Mount-Points.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Opening-URLs.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-String-Utility-Functions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-Version-Information.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-cell-renderers.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-csource.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-deprecated-widgets.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-extensions.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-gtk-file-chooser-add-thumbnail-preview.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-icon-chooser-dialog.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-miscelleanous.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-overview.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-toolbars-editor-dialog.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-toolbars-editor.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-toolbars-view.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-toolbars.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-tools.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-widgets.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo-wrap-table.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo.devhelp +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/exo.devhelp2 +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/home.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/index.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/index.sgml +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/ix01.html +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/left.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/right.png +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/style.css +-rw-r--r-- root/root usr/share/gtk-doc/html/exo/up.png +drwxr-xr-x root/root usr/share/icons/ +drwxr-xr-x root/root usr/share/icons/hicolor/ +drwxr-xr-x root/root usr/share/icons/hicolor/24x24/ +drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png +drwxr-xr-x root/root usr/share/icons/hicolor/48x48/ +drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/applications-internet.png +-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/applications-other.png +-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png +drwxr-xr-x root/root usr/share/locale/ +drwxr-xr-x root/root usr/share/locale/fr/ +drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/ +-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/libexo-0.3.mo +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/exo-csource.1.gz +-rw-r--r-- root/root usr/share/man/man1/exo-open.1.gz +drwxr-xr-x root/root usr/share/pixmaps/ +drwxr-xr-x root/root usr/share/pixmaps/exo-0.3/ +-rw-r--r-- root/root usr/share/pixmaps/exo-0.3/exo-thumbnail-frame.png +drwxr-xr-x root/root usr/share/pygtk/ +drwxr-xr-x root/root usr/share/pygtk/2.0/ +drwxr-xr-x root/root usr/share/pygtk/2.0/defs/ +drwxr-xr-x root/root usr/share/pygtk/2.0/defs/exo-0.3/ +-rw-r--r-- root/root usr/share/pygtk/2.0/defs/exo-0.3/exo.defs +drwxr-xr-x root/root usr/share/xfce4/ +drwxr-xr-x root/root usr/share/xfce4/doc/ +drwxr-xr-x root/root usr/share/xfce4/doc/C/ +-rw-r--r-- root/root usr/share/xfce4/doc/C/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/C/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/da/ +-rw-r--r-- root/root usr/share/xfce4/doc/da/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/es/ +-rw-r--r-- root/root usr/share/xfce4/doc/es/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/es/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/es/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/es/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/fr/ +-rw-r--r-- root/root usr/share/xfce4/doc/fr/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/fr/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/gl/ +-rw-r--r-- root/root usr/share/xfce4/doc/gl/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/id/ +-rw-r--r-- root/root usr/share/xfce4/doc/id/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/id/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/id/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/id/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/it/ +-rw-r--r-- root/root usr/share/xfce4/doc/it/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/it/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/ja/ +-rw-r--r-- root/root usr/share/xfce4/doc/ja/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/ja/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/pt_BR/ +-rw-r--r-- root/root usr/share/xfce4/doc/pt_BR/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/pt_BR/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/doc/tr/ +-rw-r--r-- root/root usr/share/xfce4/doc/tr/exo-preferred-applications.html +drwxr-xr-x root/root usr/share/xfce4/doc/tr/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/tr/images/exo-preferred-applications-internet.png +-rw-r--r-- root/root usr/share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png +-rw-r--r-- root/root usr/share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png +-rw-r--r-- root/root usr/share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png +drwxr-xr-x root/root usr/share/xfce4/helpers/ +-rw-r--r-- root/root usr/share/xfce4/helpers/Terminal.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/aterm.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/balsa.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/debian-sensible-browser.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/debian-x-terminal-emulator.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/encompass.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/epiphany.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/eterm.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/evolution.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/firefox.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/galeon.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/gnome-terminal.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/kmail.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/konqueror.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/links.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/lynx.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/midori.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/mozilla-browser.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/mozilla-mailer.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/mutt.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/netscape-navigator.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/nxterm.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/opera-browser.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/opera-mailer.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/sylpheed-claws.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/sylpheed.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/thunderbird.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/urxvt.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/w3m.desktop +-rw-r--r-- root/root usr/share/xfce4/helpers/xterm.desktop diff --git a/xfce/exo/.md5sum b/xfce/exo/.md5sum new file mode 100644 index 000000000..492924e1c --- /dev/null +++ b/xfce/exo/.md5sum @@ -0,0 +1,3 @@ +1c0eebb360f53eab70454b70e1bde36e exo-0.3.101.tar.bz2 +8c19efbf5f6f97c2d040817cad08fd2d exo-alt-eject.patch +7bc04f2df902b0534278176a1860106e exo-mount-options.patch diff --git a/xfce/exo/Pkgfile b/xfce/exo/Pkgfile new file mode 100755 index 000000000..e71d321f0 --- /dev/null +++ b/xfce/exo/Pkgfile @@ -0,0 +1,28 @@ +# Description: Librairie d'extension pour Xfce +# URL: http://www.os-cillation.de/ +# Maintainer: NuTyX core team +# Packager: fred.galusik at gmail dot com +# Depends on: hal, fuse, libnotify, libxfce4util, perl, p5-uri, pygtk, python + +name=exo +version=0.3.101 +release=2 +source=(http://www.xfce.org/archive/xfce-4.6.1/src/$name-$version.tar.bz2 \ +exo-alt-eject.patch \ +exo-mount-options.patch) + +build() { +cd $name-$version +patch -p1 < ../exo-alt-eject.patch +patch -p1 < ../exo-mount-options.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-python \ + --enable-notifications + make + make DESTDIR=$PKG install +} + diff --git a/xfce/exo/exo-alt-eject.patch b/xfce/exo/exo-alt-eject.patch new file mode 100755 index 000000000..316f081b4 --- /dev/null +++ b/xfce/exo/exo-alt-eject.patch @@ -0,0 +1,207 @@ +diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c +index 791a536..4084719 100644 +--- a/exo-mount/exo-mount-hal.c ++++ b/exo-mount/exo-mount-hal.c +@@ -145,6 +145,42 @@ exo_mount_hal_propagate_error (GError **error, + } + + ++static gboolean ++string_in_list(gchar * const *haystack, const gchar *needle) ++{ ++ gint n; ++ ++ if (!haystack) ++ return FALSE; ++ ++ for (n=0; haystack[n]; ++n) { ++ if (!strcmp (haystack[n], needle)) ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++ ++static gboolean ++device_has_interface(const gchar *udi, const gchar *iface, ++ DBusError *derror) ++{ ++ gboolean result; ++ gchar **interfaces; ++ ++ /* determine the info.interfaces property of the device */ ++ interfaces = libhal_device_get_property_strlist (hal_context, udi, ++ "info.interfaces", derror); ++ ++ /* check for the interface we need */ ++ result = string_in_list(interfaces, iface); ++ libhal_free_string_array(interfaces); ++ ++ return result; ++} ++ ++ ++ + + /** + * exo_mount_hal_device_from_udi: +@@ -158,18 +194,15 @@ exo_mount_hal_propagate_error (GError **error, + * or %NULL in case of an error. + **/ + ExoMountHalDevice* +-exo_mount_hal_device_from_udi (const gchar *udi, ++exo_mount_hal_device_from_udi (const gchar *in_udi, + GError **error) + { + ExoMountHalDevice *device = NULL; + DBusError derror; +- gchar **interfaces; +- gchar **volume_udis; +- gchar *volume_udi = NULL; + gint n_volume_udis; +- gint n; ++ gchar *udi; + +- g_return_val_if_fail (udi != NULL, NULL); ++ g_return_val_if_fail (in_udi != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* make sure the HAL support is initialized */ +@@ -179,55 +212,60 @@ exo_mount_hal_device_from_udi (const gchar *udi, + /* 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)) ++ udi = g_strdup (in_udi); ++ /* at this point, we own udi */ ++ ++ /* maybe we have a mountable device here */ ++ while(G_UNLIKELY (!device_has_interface (udi, ++ "org.freedesktop.Hal.Device.Volume", &derror))) + { +- /* reset D-Bus error */ +- dbus_error_free (&derror); ++ gchar **volume_udis; + +- /* release any previous volume UDI */ +- g_free (volume_udi); +- volume_udi = NULL; ++ /* maybe there was a D-Bus error? gotta check */ ++ if (G_UNLIKELY (dbus_error_is_set (&derror))) ++ { ++ exo_mount_hal_propagate_error (error, &derror); ++ g_free (udi); ++ return NULL; ++ } ++ ++ /* 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); + +- /* 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; ++ exo_mount_hal_propagate_error (error, &derror); ++ g_free (udi); ++ return NULL; + } + else if (G_UNLIKELY (n_volume_udis < 1)) + { +- /* no match, we cannot handle that device */ + libhal_free_string_array (volume_udis); +- goto err1; ++ dbus_error_free (&derror); ++ /* 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_free (udi); ++ return NULL; + } + ++ g_free (udi); ++ + /* use the first volume UDI... */ +- volume_udi = g_strdup (volume_udis[0]); ++ 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)) +- { +- /* 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; +- } ++ /* at this point, udi contains the UDI of something ++ * that implements Hal.Device.Volume. ++ * udi is the only resource that we hold here. */ + + /* setup the device struct */ + device = g_new0 (ExoMountHalDevice, 1); +- device->udi = g_strdup (udi); ++ device->udi = udi; + + /* check if we have a volume here */ + device->volume = libhal_volume_from_udi (hal_context, udi); +@@ -269,8 +307,8 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"% + if (G_UNLIKELY (device->file == NULL || device->name == NULL)) + { + exo_mount_hal_device_free (device); +- device = NULL; +- goto err0; ++ exo_mount_hal_propagate_error(error, &derror); ++ return NULL; + } + + /* check if we failed */ +@@ -282,11 +320,7 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"% + device = NULL; + } + +-out: +- /* cleanup */ +- libhal_free_string_array (interfaces); +- g_free (volume_udi); +- ++ dbus_error_free (&derror); + return device; + } + +@@ -313,7 +347,7 @@ exo_mount_hal_device_from_file (const gchar *file, + gchar **interfaces; + gchar **udis; + gint n_udis; +- gint n, m; ++ gint n; + + g_return_val_if_fail (g_path_is_absolute (file), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); +@@ -347,12 +381,7 @@ exo_mount_hal_device_from_file (const gchar *file, + continue; + + /* check if we have a mountable device here */ +- for (m = 0; interfaces[m] != NULL; ++m) +- if (strcmp (interfaces[m], "org.freedesktop.Hal.Device.Volume") == 0) +- break; +- +- /* check if it's a usable device */ +- if (interfaces[m] != NULL) ++ if (string_in_list (interfaces, "org.freedesktop.Hal.Device.Volume")) + { + libhal_free_string_array (interfaces); + break; diff --git a/xfce/exo/exo-mount-options.patch b/xfce/exo/exo-mount-options.patch new file mode 100755 index 000000000..1678062f3 --- /dev/null +++ b/xfce/exo/exo-mount-options.patch @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' exo-0.3.4/exo-mount/exo-mount-hal.c exo-0.3.4.new/exo-mount/exo-mount-hal.c +--- exo-0.3.4/exo-mount/exo-mount-hal.c 2008-03-04 19:25:43.000000000 +0100 ++++ exo-0.3.4.new/exo-mount/exo-mount-hal.c 2008-03-04 19:26:14.000000000 +0100 +@@ -676,6 +676,18 @@ + /* check if we know any valid mount options */ + if (G_LIKELY (device->fsoptions != NULL)) + { ++ /* use utf8 on ubuntu by default */ ++ if (strcmp (device->fstype, "vfat") == 0 ++ || strcmp (device->fstype, "iso9660") == 0) ++ { ++ options[n++] = g_strdup_printf ("utf8"); ++ } ++ /* pass the correct locale to ntfs-3g on ubuntu */ ++ if (strcmp (device->fstype, "ntfs") == 0) ++ { ++ options[n++] = g_strdup_printf ("locale=%s", setlocale (LC_ALL, "")); ++ } ++ + /* process all valid mount options */ + for (m = 0; device->fsoptions[m] != NULL; ++m) + { +@@ -725,8 +737,16 @@ + ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") + : g_strdup (""); + +- /* let HAL guess the fstype */ +- fstype = g_strdup (""); ++ if (strcmp (device->fstype, "ntfs") == 0) ++ { ++ /* override ntfs with ntfs-3g on ubuntu */ ++ fstype = g_strdup ("ntfs-3g"); ++ } ++ else ++ { ++ /* let HAL guess the fstype */ ++ fstype = g_strdup (""); ++ } + + /* setup the D-Bus error */ + dbus_error_init (&derror); -- cgit v1.2.3-70-g09d2