From 87e6940a18a535b95b23dea0c642f1eae85d696d Mon Sep 17 00:00:00 2001 From: Thierry N Date: Fri, 21 Aug 2009 23:11:17 +0200 Subject: Ajout de xfdesktop#4.6.1-2 --- xfce/xfdesktop/.footprint | 127 +++++++++++++++++ xfce/xfdesktop/.md5sum | 2 + xfce/xfdesktop/Pkgfile | 24 ++++ xfce/xfdesktop/post-install | 3 + .../xfdesktop-handle-unmountable-volumes.patch | 154 +++++++++++++++++++++ 5 files changed, 310 insertions(+) create mode 100644 xfce/xfdesktop/.footprint create mode 100644 xfce/xfdesktop/.md5sum create mode 100755 xfce/xfdesktop/Pkgfile create mode 100755 xfce/xfdesktop/post-install create mode 100755 xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch diff --git a/xfce/xfdesktop/.footprint b/xfce/xfdesktop/.footprint new file mode 100644 index 000000000..8c8ea7b94 --- /dev/null +++ b/xfce/xfdesktop/.footprint @@ -0,0 +1,127 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/menus/ +-rw-r--r-- root/root etc/xdg/menus/xfce-applications.menu +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/xfce4-popup-menu +-rwxr-xr-x root/root usr/bin/xfdesktop +-rwxr-xr-x root/root usr/bin/xfdesktop-settings +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/xfce4/ +drwxr-xr-x root/root usr/lib/xfce4/modules/ +-rwxr-xr-x root/root usr/lib/xfce4/modules/xfce4_desktop_menu.la +-rwxr-xr-x root/root usr/lib/xfce4/modules/xfce4_desktop_menu.so +drwxr-xr-x root/root usr/lib/xfce4/xfce4/ +drwxr-xr-x root/root usr/lib/xfce4/xfce4/panel-plugins/ +-rwxr-xr-x root/root usr/lib/xfce4/xfce4/panel-plugins/xfce4-menu-plugin +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/xfce-backdrop-settings.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-about-xfce.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-file-manager.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-help.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-logout.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-run-program.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-terminal.desktop +-rw-r--r-- root/root usr/share/applications/xfce4-web-browser.desktop +drwxr-xr-x root/root usr/share/desktop-directories/ +-rw-r--r-- root/root usr/share/desktop-directories/xfce-accessories.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-development.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-education.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-games.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-graphics.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-multimedia.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-network.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-office.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-other.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-screensavers.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-settings.directory +-rw-r--r-- root/root usr/share/desktop-directories/xfce-system.directory +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/32x32/ +drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/xfce4-backdrop.png +-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/xfce4-menueditor.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/xfce4-backdrop.png +-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/xfce4-menueditor.png +drwxr-xr-x root/root usr/share/icons/hicolor/scalable/ +drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/ +-rw-r--r-- root/root usr/share/icons/hicolor/scalable/apps/xfce4-backdrop.svg +-rw-r--r-- root/root usr/share/icons/hicolor/scalable/apps/xfce4-menueditor.svg +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/xfdesktop.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/xfdesktop.1.gz +drwxr-xr-x root/root usr/share/pixmaps/ +drwxr-xr-x root/root usr/share/pixmaps/xfce4/ +drwxr-xr-x root/root usr/share/pixmaps/xfce4/xfdesktop/ +-rw-r--r-- root/root usr/share/pixmaps/xfce4/xfdesktop/text-selection-frame.png +-rw-r--r-- root/root usr/share/pixmaps/xfce4_xicon.png +-rw-r--r-- root/root usr/share/pixmaps/xfce4_xicon1.png +-rw-r--r-- root/root usr/share/pixmaps/xfce4_xicon2.png +-rw-r--r-- root/root usr/share/pixmaps/xfce4_xicon3.png +-rw-r--r-- root/root usr/share/pixmaps/xfce4_xicon4.png +drwxr-xr-x root/root usr/share/pixmaps/xfdesktop/ +-rw-r--r-- root/root usr/share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png +drwxr-xr-x root/root usr/share/xfce4/ +drwxr-xr-x root/root usr/share/xfce4/backdrops/ +-rw-r--r-- root/root usr/share/xfce4/backdrops/flower.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-in-a-grid.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-in-the-moon.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-smoke.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-stellar-tile.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-stripes.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce-turbulence.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce4gradientcurve.png +-rw-r--r-- root/root usr/share/xfce4/backdrops/xfce4logo.png +drwxr-xr-x root/root usr/share/xfce4/doc/ +drwxr-xr-x root/root usr/share/xfce4/doc/C/ +drwxr-xr-x root/root usr/share/xfce4/doc/C/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/root_menu.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/root_menu2.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/select_bg_color.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/xfdesktop-appearance-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/xfdesktop-behavior-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/xfdesktop-editor.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/images/xfdesktop-list.png +-rw-r--r-- root/root usr/share/xfce4/doc/C/xfdesktop.html +drwxr-xr-x root/root usr/share/xfce4/doc/da/ +-rw-r--r-- root/root usr/share/xfce4/doc/da/xfdesktop.html +drwxr-xr-x root/root usr/share/xfce4/doc/fr/ +drwxr-xr-x root/root usr/share/xfce4/doc/fr/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/root_menu.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/root_menu2.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/select_bg_color.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/xfdesktop-editor.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/images/xfdesktop-list.png +-rw-r--r-- root/root usr/share/xfce4/doc/fr/xfdesktop.html +drwxr-xr-x root/root usr/share/xfce4/doc/it/ +drwxr-xr-x root/root usr/share/xfce4/doc/it/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/root_menu.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/root_menu2.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/select_bg_color.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/xfdesktop-appearance-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/xfdesktop-behavior-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/xfdesktop-editor.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/images/xfdesktop-list.png +-rw-r--r-- root/root usr/share/xfce4/doc/it/xfdesktop.html +drwxr-xr-x root/root usr/share/xfce4/doc/ja/ +drwxr-xr-x root/root usr/share/xfce4/doc/ja/images/ +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/root_menu.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/root_menu2.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/select_bg_color.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/xfdesktop-background-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/xfdesktop-icons-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/images/xfdesktop-menus-tab.png +-rw-r--r-- root/root usr/share/xfce4/doc/ja/xfdesktop.html +drwxr-xr-x root/root usr/share/xfce4/panel-plugins/ +-rw-r--r-- root/root usr/share/xfce4/panel-plugins/xfce4-menu.desktop diff --git a/xfce/xfdesktop/.md5sum b/xfce/xfdesktop/.md5sum new file mode 100644 index 000000000..53a99b0c8 --- /dev/null +++ b/xfce/xfdesktop/.md5sum @@ -0,0 +1,2 @@ +ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2 +bc388b8c81977ca3a31320285d2a9c08 xfdesktop-handle-unmountable-volumes.patch diff --git a/xfce/xfdesktop/Pkgfile b/xfce/xfdesktop/Pkgfile new file mode 100755 index 000000000..0185c6c23 --- /dev/null +++ b/xfce/xfdesktop/Pkgfile @@ -0,0 +1,24 @@ +# Description: Bureau de Xfce +# URL: http://www.xfce.org/projects/xfdesktop/ +# Maintainer: NuTyX core team +# Packager: fred.galusik at gmail dot com +# Depends on: dbus-glib, exo, libglade, libwnck, libxfce4menu, libxfce4util, libxfcegui4, libxml2, thunar, xfce4-panel, xfconf + +name=xfdesktop +version=4.6.1 +release=2 +source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2 \ +xfdesktop-handle-unmountable-volumes.patch) + +build() { +cd $name-$version +patch -p1 < ../xfdesktop-handle-unmountable-volumes.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static + make + make DESTDIR=$PKG install +} + diff --git a/xfce/xfdesktop/post-install b/xfce/xfdesktop/post-install new file mode 100755 index 000000000..03d96795a --- /dev/null +++ b/xfce/xfdesktop/post-install @@ -0,0 +1,3 @@ +#!/bin/bash +gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + diff --git a/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch b/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch new file mode 100755 index 000000000..36ac40229 --- /dev/null +++ b/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch @@ -0,0 +1,154 @@ +diff -rNaud xfdesktop-SVN29407-orig/src/xfdesktop-volume-icon.c xfdesktop-SVN29407/src/xfdesktop-volume-icon.c +--- xfdesktop-SVN29407-orig/src/xfdesktop-volume-icon.c 2009-01-29 21:29:52.000000000 +0100 ++++ xfdesktop-SVN29407/src/xfdesktop-volume-icon.c 2009-02-01 15:23:22.000000000 +0100 +@@ -505,17 +505,6 @@ + else + thunar_vfs_volume_mount(icon->priv->volume, toplevel, &error); + +- if(error) { +- gchar *primary = g_markup_printf_escaped(is_mount ? _("Unable to mount \"%s\":") +- : _("Unable to unmount \"%s\":"), +- thunar_vfs_volume_get_name(icon->priv->volume)); +- xfce_message_dialog(toplevel ? GTK_WINDOW(toplevel) : NULL, +- is_mount ? _("Mount Failed") : _("Unmount Failed"), +- GTK_STOCK_DIALOG_ERROR, primary, error->message, +- GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); +- g_free(primary); +- g_error_free(error); +- } + } + + static void +@@ -555,35 +544,41 @@ + ThunarVfsVolume *volume = volume_icon->priv->volume; + GtkWidget *mi, *img; + +- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); +- gtk_widget_show(img); +- mi = gtk_image_menu_item_new_with_mnemonic(_("_Open")); +- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- g_signal_connect_swapped(G_OBJECT(mi), "activate", +- G_CALLBACK(xfdesktop_icon_activated), icon); +- +- mi = gtk_separator_menu_item_new(); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- +- if(thunar_vfs_volume_is_ejectable(volume) +- && thunar_vfs_volume_is_mounted(volume)) +- { +- img = gtk_image_new_from_icon_name("media-eject", GTK_ICON_SIZE_MENU); +- gtk_widget_show(img); +- mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume")); +- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- g_signal_connect(G_OBJECT(mi), "activate", +- G_CALLBACK(xfdesktop_volume_icon_menu_eject), +- icon); +- } else { +- if(thunar_vfs_volume_is_mounted(volume)) { +- img = gtk_image_new_from_stock(GTK_STOCK_DISCONNECT, GTK_ICON_SIZE_MENU); +- mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume")); ++ if(thunar_vfs_volume_is_mountable(volume)) ++ { ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("_Open")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ g_signal_connect_swapped(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_icon_activated), icon); ++ ++ mi = gtk_separator_menu_item_new(); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ ++ if(thunar_vfs_volume_is_mounted(volume)) ++ { ++ if(thunar_vfs_volume_is_ejectable(volume)) ++ { ++ img = gtk_image_new_from_icon_name("media-eject", GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_volume_icon_menu_eject), ++ icon); ++ } ++ else ++ { ++ img = gtk_image_new_from_stock(GTK_STOCK_DISCONNECT, GTK_ICON_SIZE_MENU); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume")); ++ } + } else { + img = gtk_image_new_from_stock(GTK_STOCK_CONNECT, GTK_ICON_SIZE_MENU); + mi = gtk_image_menu_item_new_with_mnemonic(_("_Mount Volume")); +@@ -595,26 +590,41 @@ + g_signal_connect(G_OBJECT(mi), "activate", + G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount), + icon); +- } +- +- mi = gtk_separator_menu_item_new(); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- +- img = gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU); +- gtk_widget_show(img); +- mi = gtk_image_menu_item_new_with_mnemonic(_("_Properties...")); +- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- if(!volume_icon->priv->info) +- gtk_widget_set_sensitive(mi, FALSE); +- else { +- g_signal_connect(G_OBJECT(mi), "activate", +- G_CALLBACK(xfdesktop_volume_icon_menu_properties), +- icon); +- } +- ++ ++ mi = gtk_separator_menu_item_new(); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("_Properties...")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ if(!volume_icon->priv->info) ++ gtk_widget_set_sensitive(mi, FALSE); ++ else { ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_volume_icon_menu_properties), ++ icon); ++ } ++ } ++ else ++ { ++ if(thunar_vfs_volume_is_ejectable(volume)) ++ { ++ img = gtk_image_new_from_icon_name("media-eject", GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_volume_icon_menu_eject), ++ icon); ++ } ++ } ++ + return TRUE; + } + -- cgit v1.2.3-54-g00ecf