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

Evangelos Foutras foutrelis at archlinux.org
Fri May 24 04:00:12 UTC 2019


    Date: Friday, May 24, 2019 @ 04:00:12
  Author: foutrelis
Revision: 353928

upgpkg: thunar 1.8.6-2

Revert commit which breaks copying to Samba and WebDAV shares (FS#62705).

Added:
  thunar/trunk/bz14718-check-destination-writable.patch
Modified:
  thunar/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   11 +++++--
 bz14718-check-destination-writable.patch |   45 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-23 19:59:57 UTC (rev 353927)
+++ PKGBUILD	2019-05-24 04:00:12 UTC (rev 353928)
@@ -3,7 +3,7 @@
 
 pkgname=thunar
 pkgver=1.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern file manager for Xfce"
 arch=('x86_64')
 url="https://docs.xfce.org/xfce/thunar/start"
@@ -18,11 +18,16 @@
             '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)
-sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+        bz14718-check-destination-writable.patch)
+sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a'
+            '0ce17a449f8b853828a660389b06037ee9317c3d295b4ff184b196c72bf30f79')
 
 prepare() {
   cd "$srcdir/Thunar-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=15367
+  patch -Rp1 -i ../bz14718-check-destination-writable.patch
 }
 
 build() {

Added: bz14718-check-destination-writable.patch
===================================================================
--- bz14718-check-destination-writable.patch	                        (rev 0)
+++ bz14718-check-destination-writable.patch	2019-05-24 04:00:12 UTC (rev 353928)
@@ -0,0 +1,45 @@
+From d4cc7e6fc0a39a0d554375c7530df7a20802e354 Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm at xfce.org>
+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);


More information about the arch-commits mailing list