[arch-commits] Commit in exo/repos (3 files)

[andyrtr at archlinux.org]

    Date: Tuesday, October 20, 2009 @ 11:36:27
  Author: andyrtr
Revision: 56258

Merged revisions 56257 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/exo/trunk

........
  r56257 | andyrtr | 2009-10-20 15:35:37 +0000 (Di, 20 Okt 2009) | 2 lines
  
  upgpkg: exo 0.3.105-2
      fix slow usb writes, #16750
........

Added:
  exo/repos/extra-x86_64/fix_usb_throughput.patch
    (from rev 56257, exo/trunk/fix_usb_throughput.patch)
Modified:
  exo/repos/extra-x86_64/	(properties)
  exo/repos/extra-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++++---
 fix_usb_throughput.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)


Property changes on: exo/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /exo/trunk:1-56163
   + /exo/trunk:1-56257

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-20 15:35:37 UTC (rev 56257)
+++ extra-x86_64/PKGBUILD	2009-10-20 15:36:27 UTC (rev 56258)
@@ -4,7 +4,7 @@
 
 pkgname=exo
 pkgver=0.3.105
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL')
@@ -16,11 +16,15 @@
             'perl-uri		for mail-compose helper script')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ba87f84894498bf23ae39d849c55f98c')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2
+	fix_usb_throughput.patch)
+md5sums=('ba87f84894498bf23ae39d849c55f98c'
+         '0be6fb1242d687ae587880b4a10218fe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # fix http://bugs.archlinux.org/task/16750
+  patch -Np1 -i $srcdir/fix_usb_throughput.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var --disable-static --enable-notifications \
     --enable-python || return 1

Copied: exo/repos/extra-x86_64/fix_usb_throughput.patch (from rev 56257, exo/trunk/fix_usb_throughput.patch)
===================================================================
--- extra-x86_64/fix_usb_throughput.patch	                        (rev 0)
+++ extra-x86_64/fix_usb_throughput.patch	2009-10-20 15:36:27 UTC (rev 56258)
@@ -0,0 +1,14 @@
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index bbf9ca3..d09d0db 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+         {
+           option = NULL;
+ 
+-          if (strcmp (device->fsoptions[m], "sync") == 0)
++          if (strcmp (device->fsoptions[m], "sync") == 0
++              && device->volume == NULL)
+             {
+               /* non-pollable drive... */
+               option = g_strdup ("sync");