summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-07-10 21:14:50 +0200
committertnut <thierryn1 at hispeed dot ch>2010-07-10 21:14:50 +0200
commit808f2673ec3058e02d186974aa4fe6c1a1f2da35 (patch)
treec5800f58e3c02fb17cbd8425354a43cd86d32474
parentb8684da0a677c00eb9c9b8e08e1344a6a0d8727a (diff)
downloadnutyx-extra-808f2673ec3058e02d186974aa4fe6c1a1f2da35.tar.gz
nutyx-extra-808f2673ec3058e02d186974aa4fe6c1a1f2da35.tar.bz2
nutyx-extra-808f2673ec3058e02d186974aa4fe6c1a1f2da35.tar.xz
nutyx-extra-808f2673ec3058e02d186974aa4fe6c1a1f2da35.zip
maj xfdesktop#4.6.2-2
-rw-r--r--xfce/xfdesktop/.footprint1
-rw-r--r--xfce/xfdesktop/.md5sum2
-rwxr-xr-xxfce/xfdesktop/Pkgfile8
-rw-r--r--xfce/xfdesktop/attapu.pngbin0 -> 550143 bytes
-rwxr-xr-xxfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch154
5 files changed, 7 insertions, 158 deletions
diff --git a/xfce/xfdesktop/.footprint b/xfce/xfdesktop/.footprint
index 4e9504a8e..ec071d87d 100644
--- a/xfce/xfdesktop/.footprint
+++ b/xfce/xfdesktop/.footprint
@@ -73,6 +73,7 @@ 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/attapu.png
-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
diff --git a/xfce/xfdesktop/.md5sum b/xfce/xfdesktop/.md5sum
index bfdbec666..a742dfff5 100644
--- a/xfce/xfdesktop/.md5sum
+++ b/xfce/xfdesktop/.md5sum
@@ -1,3 +1,3 @@
+6aa55c99b9a23af3eb4777d55063d4c7 attapu.png
41fa266e6493a17a0dee5c5103f94567 nutyx2009_2.png
e800ea9fee7a5c5eaf2ae96e23a83e3a xfdesktop-4.6.2.tar.bz2
-bc388b8c81977ca3a31320285d2a9c08 xfdesktop-handle-unmountable-volumes.patch
diff --git a/xfce/xfdesktop/Pkgfile b/xfce/xfdesktop/Pkgfile
index 54f2c6777..6f8740c99 100755
--- a/xfce/xfdesktop/Pkgfile
+++ b/xfce/xfdesktop/Pkgfile
@@ -6,13 +6,13 @@
name=xfdesktop
version=4.6.2
-release=1
+release=2
source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2 \
-xfdesktop-handle-unmountable-volumes.patch nutyx2009_2.png)
+attapu.png nutyx2009_2.png)
build() {
cd $name-$version
-# patch -p1 < ../xfdesktop-handle-unmountable-volumes.patch
+ sed -i "s/xfce-stripes.png/attapu.png/" common/xfdesktop-common.h
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib/xfce4 \
@@ -20,6 +20,8 @@ cd $name-$version
--disable-static
make
make DESTDIR=$PKG install
+ install -D -m644 ../attapu.png \
+ $PKG/usr/share/xfce4/backdrops/attapu.png
cp ../nutyx2009_2.png \
$PKG/usr/share/pixmaps/nutyx2009_2.png
sed -i "s/xfce4_xicon1/nutyx2009_2/" \
diff --git a/xfce/xfdesktop/attapu.png b/xfce/xfdesktop/attapu.png
new file mode 100644
index 000000000..b60196d47
--- /dev/null
+++ b/xfce/xfdesktop/attapu.png
Binary files differ
diff --git a/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch b/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch
deleted file mode 100755
index 36ac40229..000000000
--- a/xfce/xfdesktop/xfdesktop-handle-unmountable-volumes.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-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;
- }
-