Date: Saturday, June 29, 2019 @ 14:18:55 Author: foutrelis Revision: 357058
upgpkg: thunar 1.8.7-1 New upstream release. Added: thunar/trunk/bz15352-revert-deactivate-move-to-trash.patch Modified: thunar/trunk/PKGBUILD Deleted: thunar/trunk/bz14718-check-destination-writable.patch -----------------------------------------------+ PKGBUILD | 14 ++--- bz14718-check-destination-writable.patch | 45 ------------------ bz15352-revert-deactivate-move-to-trash.patch | 60 ++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-29 13:46:04 UTC (rev 357057) +++ PKGBUILD 2019-06-29 14:18:55 UTC (rev 357058) @@ -2,8 +2,8 @@ # Contributor: Andrew Simmons <[email protected]> pkgname=thunar -pkgver=1.8.6 -pkgrel=2 +pkgver=1.8.7 +pkgrel=1 pkgdesc="Modern file manager for Xfce" arch=('x86_64') url="https://docs.xfce.org/xfce/thunar/start"; @@ -19,15 +19,15 @@ 'thunar-archive-plugin: create and deflate archives' 'thunar-media-tags-plugin: view/edit id3/ogg tags') source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2 - bz14718-check-destination-writable.patch) -sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a' - '0ce17a449f8b853828a660389b06037ee9317c3d295b4ff184b196c72bf30f79') + bz15352-revert-deactivate-move-to-trash.patch) +sha256sums=('3e033af06751beee23e73cf16cbd97513d3c0adf358d8a42158af38a44b9d329' + 'c531416c79bb7b196e649e36f032d7e257eeff0e7e455dcefc7c174268c24345') prepare() { cd "$srcdir/Thunar-$pkgver" - # https://bugzilla.xfce.org/show_bug.cgi?id=15367 - patch -Rp1 -i ../bz14718-check-destination-writable.patch + # https://bugzilla.xfce.org/show_bug.cgi?id=15352#c12 + patch -Np1 -i ../bz15352-revert-deactivate-move-to-trash.patch } build() { Deleted: bz14718-check-destination-writable.patch =================================================================== --- bz14718-check-destination-writable.patch 2019-06-29 13:46:04 UTC (rev 357057) +++ bz14718-check-destination-writable.patch 2019-06-29 14:18:55 UTC (rev 357058) @@ -1,45 +0,0 @@ -From d4cc7e6fc0a39a0d554375c7530df7a20802e354 Mon Sep 17 00:00:00 2001 -From: Andre Miranda <[email protected]> -Date: Fri, 5 Apr 2019 23:16:52 -0300 -Subject: [PATCH] Correctly check if destination is writable (Bug #14718) - ---- - thunar/thunar-transfer-job.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c -index 570f28a2..47fa3bfc 100644 ---- a/thunar/thunar-transfer-job.c -+++ b/thunar/thunar-transfer-job.c -@@ -827,14 +827,25 @@ thunar_transfer_job_verify_destination (ThunarTransferJob *transfer_job, - } - } - -- if (succeed && g_file_info_get_attribute_boolean (filesystem_info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) -+ if (succeed) - { -- g_set_error (error, G_IO_ERROR, G_IO_ERROR_READ_ONLY, -- _("Error while copying to \"%s\": The destination is read-only"), -- dest_name); -+ dest_info = g_file_query_info (dest, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, 0, -+ exo_job_get_cancellable (EXO_JOB (transfer_job)), -+ NULL); - -- /* meh */ -- succeed = FALSE; -+ if (dest_info != NULL) -+ { -+ if (!g_file_info_get_attribute_boolean (dest_info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) -+ { -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_READ_ONLY, -+ _("Error while copying to \"%s\": The destination is read-only"), -+ dest_name); -+ -+ succeed = FALSE; -+ } -+ -+ g_object_unref (G_OBJECT (dest_info)); -+ } - } - - g_object_unref (filesystem_info); Added: bz15352-revert-deactivate-move-to-trash.patch =================================================================== --- bz15352-revert-deactivate-move-to-trash.patch (rev 0) +++ bz15352-revert-deactivate-move-to-trash.patch 2019-06-29 14:18:55 UTC (rev 357058) @@ -0,0 +1,60 @@ +From 67708919154038c9f161389009167d04a7ee0be4 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <[email protected]> +Date: Sat, 29 Jun 2019 17:10:36 +0300 +Subject: [PATCH] Revert "Deactivate "Move to Trash" menu entry on volumes + without trash (Bug #15352)" + +This reverts commit efcbf4d59a8bdd4d8197c92b857eead676ce2100. + +That commit makes it impossible to remove files using WebDAV. +--- + thunar/thunar-standard-view.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c +index 111d9999..6fd92d72 100644 +--- a/thunar/thunar-standard-view.c ++++ b/thunar/thunar-standard-view.c +@@ -4438,7 +4438,6 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view) + ThunarFile *current_directory; + gboolean can_paste_into_folder; + gboolean restorable; +- gboolean trashable; + gboolean pastable; + gboolean writable; + gboolean trashed; +@@ -4462,7 +4461,6 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view) + /* determine the new list of selected files (replacing GtkTreePath's with ThunarFile's) */ + selected_files = (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->get_selected_items) (standard_view); + restorable = (selected_files != NULL); +- trashable = (selected_files != NULL); + for (lp = selected_files; lp != NULL; lp = lp->next, ++n_selected_files) + { + /* determine the iterator for the path */ +@@ -4477,16 +4475,12 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view) + /* enable "Restore" if we have only trashed files (atleast one file) */ + if (!thunar_file_is_trashed (lp->data)) + restorable = FALSE; +- +- /* enable "Move to Trash" if files can be trashed */ +- if (!thunar_file_can_be_trashed (lp->data)) +- trashable = FALSE; + } + + /* and setup the new selected files list */ + standard_view->priv->selected_files = selected_files; + +- /* check whether the folder displayed by the view is writable/in the trash/can be trashed */ ++ /* check whether the folder displayed by the view is writable/in the trash */ + current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view)); + writable = (current_directory != NULL && thunar_file_is_writable (current_directory)); + trashed = (current_directory != NULL && thunar_file_is_trashed (current_directory)); +@@ -4535,7 +4529,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS + + /* update the "Move to Trash" action */ + g_object_set (G_OBJECT (standard_view->priv->action_move_to_trash), +- "sensitive", (n_selected_files > 0) && trashable, ++ "sensitive", (n_selected_files > 0) && writable, + "visible", !trashed && thunar_g_vfs_is_uri_scheme_supported ("trash"), + "tooltip", ngettext ("Move the selected file to the Trash", + "Move the selected files to the Trash",
