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

[andyrtr at archlinux.org]

    Date: Thursday, December 17, 2009 @ 14:27:07
  Author: andyrtr
Revision: 61512

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

........
  r61511 | andyrtr | 2009-12-17 19:26:15 +0000 (Do, 17 Dez 2009) | 2 lines
  
  upgpkg: exo 0.3.106-1
      new version 0.3.106, remove patch that went upstream
........

Modified:
  exo/repos/extra-i686/	(properties)
  exo/repos/extra-i686/PKGBUILD
Deleted:
  exo/repos/extra-i686/fix_usb_throughput.patch

--------------------------+
 PKGBUILD                 |   12 ++++--------
 fix_usb_throughput.patch |   14 --------------
 2 files changed, 4 insertions(+), 22 deletions(-)


Property changes on: exo/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /exo/trunk:1-58415
   + /exo/trunk:1-61511

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-17 19:26:15 UTC (rev 61511)
+++ extra-i686/PKGBUILD	2009-12-17 19:27:07 UTC (rev 61512)
@@ -3,8 +3,8 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=exo
-pkgver=0.3.105
-pkgrel=3
+pkgver=0.3.106
+pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL')
@@ -16,15 +16,11 @@
             '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
-	fix_usb_throughput.patch)
-md5sums=('ba87f84894498bf23ae39d849c55f98c' '0be6fb1242d687ae587880b4a10218fe')
-sha1sums=('2f424cf473ff834b2208a436061af75c6c6b80a9' 'dbfcf62bf6fa76522fb5f3859e653d4a6b93cda8')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('927905f89252fa397e50d7a4fbf3c9a7')
 
 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

Deleted: extra-i686/fix_usb_throughput.patch
===================================================================
--- extra-i686/fix_usb_throughput.patch	2009-12-17 19:26:15 UTC (rev 61511)
+++ extra-i686/fix_usb_throughput.patch	2009-12-17 19:27:07 UTC (rev 61512)
@@ -1,14 +0,0 @@
-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");