[arch-commits] Commit in thunar/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, July 19, 2019 @ 23:22:52
  Author: foutrelis
Revision: 358405

upgpkg: thunar 1.8.8-1

New upstream release.

Modified:
  thunar/trunk/PKGBUILD
Deleted:
  thunar/trunk/bz15352-revert-deactivate-move-to-trash.patch

-----------------------------------------------+
 PKGBUILD                                      |   11 +---
 bz15352-revert-deactivate-move-to-trash.patch |   60 ------------------------
 2 files changed, 3 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-19 23:12:15 UTC (rev 358404)
+++ PKGBUILD	2019-07-19 23:22:52 UTC (rev 358405)
@@ -2,7 +2,7 @@
 # Contributor: Andrew Simmons <andrew.simmons at gmail.com>
 
 pkgname=thunar
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
@@ -18,16 +18,11 @@
             'thunar-volman: manages removable devices'
             '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
-        bz15352-revert-deactivate-move-to-trash.patch)
-sha256sums=('3e033af06751beee23e73cf16cbd97513d3c0adf358d8a42158af38a44b9d329'
-            'c531416c79bb7b196e649e36f032d7e257eeff0e7e455dcefc7c174268c24345')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('a03761de4a43c36b9daa6029e6e3263a23c8ce429d78a9f9156ab48efdb2800c')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=15352#c12
-  patch -Np1 -i ../bz15352-revert-deactivate-move-to-trash.patch
 }
 
 build() {

Deleted: bz15352-revert-deactivate-move-to-trash.patch
===================================================================
--- bz15352-revert-deactivate-move-to-trash.patch	2019-07-19 23:12:15 UTC (rev 358404)
+++ bz15352-revert-deactivate-move-to-trash.patch	2019-07-19 23:22:52 UTC (rev 358405)
@@ -1,60 +0,0 @@
-From 67708919154038c9f161389009167d04a7ee0be4 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-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",