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

[Evangelos Foutras]

    Date: Monday, April 20, 2015 @ 20:11:59
  Author: foutrelis
Revision: 237796

upgpkg: thunar 1.6.7-1

New upstream release.

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

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

Deleted: 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch
===================================================================
--- 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch	2015-04-20 18:10:45 UTC (rev 237795)
+++ 0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch	2015-04-20 18:11:59 UTC (rev 237796)
@@ -1,27 +0,0 @@
-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-04-20 18:10:45 UTC (rev 237795)
+++ PKGBUILD	2015-04-20 18:11:59 UTC (rev 237796)
@@ -3,8 +3,8 @@
 # Contributor: Andrew Simmons <andrew.simmons at gmail.com>
 
 pkgname=thunar
-pkgver=1.6.6
-pkgrel=2
+pkgver=1.6.7
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -20,16 +20,11 @@
             '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
-        0001-Fallback-to-non-cached-version-of-source-file-bug-91.patch)
-sha256sums=('b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2'
-            'a4e26ff5debb4e8324e26ea62a2897f5c63f5e11376cd35bea2950714039fa4f')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('e35f05d5413ffd26bfe866f47b1d199045e3b42912da47c831d3689e12336ee5')
 
 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() {