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

[Evangelos Foutras]

    Date: Saturday, May 26, 2012 @ 00:29:43
  Author: foutrelis
Revision: 159693

upgpkg: thunar 1.4.0-2

Fix FS#29894: Loop devices not appearing in Thunar side pane.

Added:
  thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch
Modified:
  thunar/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   13 ++++++++++---
 thunar-1.4.0-show-loop-devices-hack.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-26 02:34:17 UTC (rev 159692)
+++ PKGBUILD	2012-05-26 04:29:43 UTC (rev 159693)
@@ -4,7 +4,7 @@
 
 pkgname=thunar
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -22,12 +22,19 @@
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2)
-sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
+        thunar-1.4.0-show-loop-devices-hack.patch)
+sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
+            '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
 
+  # Fix: Loop devices not appearing in Thunar side pane
+  # https://bugs.archlinux.org/task/29894
+  # https://bugzilla.xfce.org/show_bug.cgi?id=8947
+  patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

Added: thunar-1.4.0-show-loop-devices-hack.patch
===================================================================
--- thunar-1.4.0-show-loop-devices-hack.patch	                        (rev 0)
+++ thunar-1.4.0-show-loop-devices-hack.patch	2012-05-26 04:29:43 UTC (rev 159693)
@@ -0,0 +1,15 @@
+diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c
+--- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c	2012-05-26 07:03:39.000000000 +0300
++++ Thunar-1.4.0/thunar/thunar-gio-extensions.c	2012-05-26 07:05:06.000000000 +0300
+@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
+       has_media = g_drive_has_media (drive);
+       g_object_unref (drive);
+     }
++  else
++    {
++      /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
++      has_media = g_volume_can_mount (volume);
++    }
+ 
+   mount = g_volume_get_mount (volume);
+   if (mount != NULL)