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

[Evangelos Foutras]

    Date: Wednesday, March 25, 2015 @ 11:35:07
  Author: foutrelis
Revision: 234691

upgpkg: thunar 1.6.6-2

Fix drag and drop from the desktop to be a move operation (FS#44328).

Added:
  thunar/trunk/0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
Modified:
  thunar/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch |   27 ++++++++++
 PKGBUILD                                                        |   15 ++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

Added: 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
===================================================================
--- 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch	                        (rev 0)
+++ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch	2015-03-25 10:35:07 UTC (rev 234691)
@@ -0,0 +1,27 @@
+From cdfdb7290abb270f5f98c93089c3b6e3c35859bc Mon Sep 17 00:00:00 2001
+From: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
+Date: Sun, 22 Feb 2015 23:34:45 +0100
+Subject: [PATCH] Fallback to non-cached version of source file (bug #9142)
+
+---
+ thunar/thunar-file.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index 9b5aa9b..9dedf47 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -1978,6 +1978,10 @@ thunar_file_accepts_drop (ThunarFile     *file,
+               /* determine the cached version of the source file */
+               ofile = thunar_file_cache_lookup (lp->data);
+ 
++              /* fallback to non-cached version */
++              if (ofile == NULL)
++                ofile = thunar_file_get (lp->data, NULL);
++
+               /* we have only move if we know the source and both the source and the target
+                * are on the same disk, and the source file is owned by the current user.
+                */
+-- 
+2.3.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-25 09:58:11 UTC (rev 234690)
+++ PKGBUILD	2015-03-25 10:35:07 UTC (rev 234691)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.6.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -20,9 +20,18 @@
             'thunar-archive-plugin: create and deflate archives'
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
-sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+        0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
+sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2'
+            'a4e26ff5debb4e8324e26ea62a2897f5c63f5e11376cd35bea2950714039fa4f')
 
+prepare() {
+  cd "$srcdir/Thunar-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9142
+  patch -Np1 -i ../0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
+}
+
 build() {
   cd "$srcdir/Thunar-$pkgver"