[arch-commits] Commit in thunar/trunk (PKGBUILD fix-samba.patch)

[Tobias Powalowski]

    Date: Thursday, August 25, 2011 @ 02:44:39
  Author: tpowa
Revision: 136234

upgpkg: thunar 1.2.2-3

	fix samba regression in network shares #25016

Added:
  thunar/trunk/fix-samba.patch
Modified:
  thunar/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 +++++++------
 fix-samba.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-25 06:36:16 UTC (rev 136233)
+++ PKGBUILD	2011-08-25 06:44:39 UTC (rev 136234)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="modern file manager for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -24,11 +24,13 @@
 backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
 	org.freedesktop.udisks.pkla
-        fix-gvfs.patch)
+        fix-gvfs.patch
+	fix-samba.patch)
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
   patch -Np1 -i ../fix-gvfs.patch
+  patch -Np1 -i ../fix-samba.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -57,9 +59,8 @@
   install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
   install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+
 md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
          'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
-         'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '167c79462cddc5aaa1fcdc814041350b')
+         '167c79462cddc5aaa1fcdc814041350b'
+         'c8063873958d89402046f29b78c1d8d4')

Added: fix-samba.patch
===================================================================
--- fix-samba.patch	                        (rev 0)
+++ fix-samba.patch	2011-08-25 06:44:39 UTC (rev 136234)
@@ -0,0 +1,14 @@
+--- thunar-file-ORIGINAL.c	2011-05-27 00:11:27.000000000 +0200
++++ thunar-1.2.2/thunar/thunar-file.c	2011-08-22 08:00:24.095066077 +0200
+@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile   *file,
+           target_uri = 
+             g_file_info_get_attribute_string (file->info,
+                                               G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+-          file->is_mounted = (target_uri != NULL);
++          file->is_mounted = (target_uri != NULL)
++			? !g_file_info_get_attribute_boolean (file->info,
++                                                  G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT)
++            : FALSE;
+         }
+     }
+   else