summaryrefslogtreecommitdiffstats
path: root/xfce
diff options
context:
space:
mode:
Diffstat (limited to 'xfce')
-rw-r--r--xfce/thunar/.md5sum1
-rwxr-xr-xxfce/thunar/Pkgfile3
-rw-r--r--xfce/thunar/libpng-1.4.patch12
-rwxr-xr-xxfce/thunar/thunar-volman-handle-unmountable-volumes.patch223
4 files changed, 1 insertions, 238 deletions
diff --git a/xfce/thunar/.md5sum b/xfce/thunar/.md5sum
index 688f4b3a1..4e56d6764 100644
--- a/xfce/thunar/.md5sum
+++ b/xfce/thunar/.md5sum
@@ -1,3 +1,2 @@
c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2
-ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch
5fdeb9aae2885fbe1a19b3d6fff58ab1 thunar-volman-handle-unmountable-volumes.patch
diff --git a/xfce/thunar/Pkgfile b/xfce/thunar/Pkgfile
index 983044882..54a7c425d 100755
--- a/xfce/thunar/Pkgfile
+++ b/xfce/thunar/Pkgfile
@@ -8,12 +8,11 @@ name=thunar
version=1.0.2
release=1
source=(http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-$version.tar.bz2 \
-thunar-volman-handle-unmountable-volumes.patch libpng-1.4.patch)
+ http://nutyx.meticul.eu/files/patchs/thunar-volman-handle-unmountable-volumes.patch)
build() {
cd Thunar-$version
patch -p1 < ../thunar-volman-handle-unmountable-volumes.patch
-# patch -Np1 -i ../libpng-1.4.patch
./configure --prefix=/usr\
--sysconfdir=/etc \
--libexecdir=/usr/lib/xfce4 \
diff --git a/xfce/thunar/libpng-1.4.patch b/xfce/thunar/libpng-1.4.patch
deleted file mode 100644
index 7f38165f7..000000000
--- a/xfce/thunar/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c
---- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:31:35.000000000 -0500
-+++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:34:51.000000000 -0500
-@@ -1169,7 +1169,7 @@
- goto done0;
-
- /* verify the png signature */
-- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
-+ if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature))))
- rewind (fp);
- else
- goto done0;
diff --git a/xfce/thunar/thunar-volman-handle-unmountable-volumes.patch b/xfce/thunar/thunar-volman-handle-unmountable-volumes.patch
deleted file mode 100755
index d9b0dd6a7..000000000
--- a/xfce/thunar/thunar-volman-handle-unmountable-volumes.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -rNaud thunar-SVN29407-orig/thunar/thunar-shortcuts-view.c thunar-SVN29407/thunar/thunar-shortcuts-view.c
---- thunar-SVN29407-orig/thunar/thunar-shortcuts-view.c 2009-01-29 21:28:03.000000000 +0100
-+++ thunar-SVN29407/thunar/thunar-shortcuts-view.c 2009-02-01 14:36:40.000000000 +0100
-@@ -812,39 +812,46 @@
-
- /* prepare the popup menu */
- menu = gtk_menu_new ();
-+
-+ /* We don't need these items for non mountable volumes */
-+ if ((G_UNLIKELY (volume == NULL)) || (thunar_vfs_volume_is_mountable (volume)))
-+ {
-+ /* append the "Open" menu action */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-
-- /* append the "Open" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-+ /* set the stock icon */
-+ image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-+ gtk_widget_show (image);
-
-- /* set the stock icon */
-- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-- gtk_widget_show (image);
-+ /* append the "Open in New Window" menu action */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open_in_new_window), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-
-- /* append the "Open in New Window" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_open_in_new_window), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-+ /* append a menu separator */
-+ item = gtk_separator_menu_item_new ();
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
-
-- /* append a menu separator */
-- item = gtk_separator_menu_item_new ();
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-
- /* check if we have a volume here */
- if (G_UNLIKELY (volume != NULL))
- {
- /* append the "Mount Volume" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
-- gtk_widget_set_sensitive (item, !thunar_vfs_volume_is_mounted (volume));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_mount), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
--
-+ if (thunar_vfs_volume_is_mountable (volume))
-+ {
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
-+ gtk_widget_set_sensitive (item, !thunar_vfs_volume_is_mounted (volume));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_mount), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
- /* check if the volume is ejectable */
- if (thunar_vfs_volume_is_ejectable (volume))
- {
-@@ -856,12 +863,15 @@
- }
- else
- {
-- /* append the "Unmount Volume" menu item */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount Volume"));
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_mounted (volume));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_unmount), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-+ if (thunar_vfs_volume_is_mountable (volume))
-+ {
-+ /* append the "Unmount Volume" menu item */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount Volume"));
-+ gtk_widget_set_sensitive (item, thunar_vfs_volume_is_mounted (volume));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_unmount), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
- }
-
- /* append a menu separator */
-diff -rNaud thunar-SVN29407-orig/thunar/thunar-tree-view.c thunar-SVN29407/thunar/thunar-tree-view.c
---- thunar-SVN29407-orig/thunar/thunar-tree-view.c 2009-01-29 21:28:03.000000000 +0100
-+++ thunar-SVN29407/thunar/thunar-tree-view.c 2009-02-01 14:36:17.000000000 +0100
-@@ -1058,40 +1058,48 @@
-
- /* prepare the popup menu */
- menu = gtk_menu_new ();
-+
-+ /* We don't need these items for non mountable volumes */
-+ if ((G_UNLIKELY (volume == NULL)) || (thunar_vfs_volume_is_mountable (volume)))
-+ {
-
-- /* append the "Open" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
-- gtk_widget_show (item);
--
-- /* set the stock icon */
-- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-- gtk_widget_show (image);
-+ /* append the "Open" menu action */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
-+ gtk_widget_show (item);
-
-- /* append the "Open in New Window" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open_in_new_window), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
-- gtk_widget_show (item);
-+ /* set the stock icon */
-+ image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-+ gtk_widget_show (image);
-
-- /* append a separator item */
-- item = gtk_separator_menu_item_new ();
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-+ /* append the "Open in New Window" menu action */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open_in_new_window), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
-+ gtk_widget_show (item);
-
-+ /* append a separator item */
-+ item = gtk_separator_menu_item_new ();
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
-+
-+ /* check if we have a volume here */
- if (G_UNLIKELY (volume != NULL))
- {
- /* append the "Mount Volume" menu action */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
-- gtk_widget_set_sensitive (item, !thunar_vfs_volume_is_mounted (volume));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_mount), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
--
-+ if (thunar_vfs_volume_is_mountable (volume))
-+ {
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
-+ gtk_widget_set_sensitive (item, !thunar_vfs_volume_is_mounted (volume));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_mount), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
- /* check if the volume is ejectable */
- if (thunar_vfs_volume_is_ejectable (volume))
- {
-@@ -1102,15 +1110,17 @@
- gtk_widget_show (item);
- }
- else
-- {
-- /* append the "Unmount Volume" menu item */
-- item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount Volume"));
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_mounted (volume));
-- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_unmount), view);
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- gtk_widget_show (item);
-- }
--
-+ {
-+ if (thunar_vfs_volume_is_mountable (volume))
-+ {
-+ /* append the "Unmount Volume" menu item */
-+ item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount Volume"));
-+ gtk_widget_set_sensitive (item, thunar_vfs_volume_is_mounted (volume));
-+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_unmount), view);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ gtk_widget_show (item);
-+ }
-+ }
- /* append a menu separator */
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-diff -rNaud thunar-SVN29407-orig/thunar-vfs/thunar-vfs-volume-hal.c thunar-SVN29407/thunar-vfs/thunar-vfs-volume-hal.c
---- thunar-SVN29407-orig/thunar-vfs/thunar-vfs-volume-hal.c 2009-01-29 21:28:09.000000000 +0100
-+++ thunar-SVN29407/thunar-vfs/thunar-vfs-volume-hal.c 2009-02-01 14:37:05.000000000 +0100
-@@ -1014,9 +1014,6 @@
-
- if (G_LIKELY (hv != NULL))
- {
-- /* check if we have a mountable file system here */
-- if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
-- {
- /* determine the UDI of the drive to which this volume belongs */
- drive_udi = libhal_volume_get_storage_device_udi (hv);
- if (G_LIKELY (drive_udi != NULL))
-@@ -1051,7 +1048,6 @@
- libhal_drive_free (hd);
- }
- }
-- }
-
- /* release the HAL volume */
- libhal_volume_free (hv);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-02 10:50:31 +0000