Date: Friday, June 30, 2017 @ 23:32:06 Author: foutrelis Revision: 299446
upgpkg: thunar 1.6.12-1 New upstream release. Modified: thunar/trunk/PKGBUILD Deleted: thunar/trunk/0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch -----------------------------------------------------------------+ 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch | 43 ---------- PKGBUILD | 17 --- 2 files changed, 4 insertions(+), 56 deletions(-) Deleted: 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch =================================================================== --- 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 22:01:34 UTC (rev 299445) +++ 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch 2017-06-30 23:32:06 UTC (rev 299446) @@ -1,43 +0,0 @@ -From 4dd549db77838c9345f10a72f10e705f8ae327d4 Mon Sep 17 00:00:00 2001 -From: Viktor Odintsev <[email protected]> -Date: Thu, 13 Apr 2017 01:15:53 +0300 -Subject: [PATCH] Fix deadlock in mutex causing Thunar to hang (Bug #13481) - -file_rename_mutex could remain locked due to the return statement -in function thunar_file_monitor. ---- - thunar/thunar-file.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c -index c7aae58a..53bebbcd 100644 ---- a/thunar/thunar-file.c -+++ b/thunar/thunar-file.c -@@ -827,16 +827,16 @@ thunar_file_monitor (GFileMonitor *monitor, - else - other_file = thunar_file_get (other_path, NULL); - -- if (other_file == NULL) -- return; -- -- /* notify the thumbnail cache that we can now also move the thumbnail */ -- thunar_file_move_thumbnail_cache_file (event_path, other_path); -+ if (other_file != NULL) -+ { -+ /* notify the thumbnail cache that we can now also move the thumbnail */ -+ thunar_file_move_thumbnail_cache_file (event_path, other_path); - -- /* reload the containing target folder */ -- thunar_file_reload_parent (other_file); -+ /* reload the containing target folder */ -+ thunar_file_reload_parent (other_file); - -- g_object_unref (other_file); -+ g_object_unref (other_file); -+ } - - G_UNLOCK (file_rename_mutex); - } --- -2.12.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-30 22:01:34 UTC (rev 299445) +++ PKGBUILD 2017-06-30 23:32:06 UTC (rev 299446) @@ -3,8 +3,8 @@ # Contributor: Andrew Simmons <[email protected]> pkgname=thunar -pkgver=1.6.11 -pkgrel=2 +pkgver=1.6.12 +pkgrel=1 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64') url="http://thunar.xfce.org"; @@ -19,18 +19,9 @@ 'thunar-volman: manages removable devices' 'thunar-archive-plugin: create and deflate archives' 'thunar-media-tags-plugin: view/edit id3/ogg tags') -source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2 - 0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch) -sha256sums=('b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42' - '8b3bc7c848d8beedaecfea84169eecaee4019cca68b85eae4786b2d59f6889d2') +source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2) +sha256sums=('fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086') -prepare() { - cd "$srcdir/Thunar-$pkgver" - - # https://bugzilla.xfce.org/show_bug.cgi?id=13481 - patch -Np1 -i ../0001-Fix-deadlock-in-mutex-causing-Thunar-to-hang-Bug-134.patch -} - build() { cd "$srcdir/Thunar-$pkgver"
