[arch-commits] Commit in gvfs/repos/gnome-i686 (PKGBUILD bug536614.patch)

[Jan de Groot]

    Date: Sunday, August 24, 2008 @ 02:37:07
  Author: jgc
Revision: 10143

gvfs 0.99.5 - GNOME 2.23.90

Modified:
  gvfs/repos/gnome-i686/PKGBUILD
Deleted:
  gvfs/repos/gnome-i686/bug536614.patch

-----------------+
 PKGBUILD        |   13 +++++--------
 bug536614.patch |   47 -----------------------------------------------
 2 files changed, 5 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-24 06:28:24 UTC (rev 10142)
+++ PKGBUILD	2008-08-24 06:37:07 UTC (rev 10143)
@@ -2,24 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gvfs
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.99.5
+pkgrel=1
 pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libsoup>=2.4.1' 'libcdio>=0.80-2' 'fuse>=2.7.3' 'bluez-libs>=3.31' 'smbclient>=3.0.28A' 'libgphoto2>=2.4.0-6' 'gnome-keyring>=2.22.3' 'avahi>=0.6.20' 'libarchive>=2.4.17')
+depends=('libsoup>=2.23.6' 'libcdio>=0.80-3' 'fuse>=2.7.3' 'bluez-libs>=3.32' 'smbclient>=3.0.31' 'libgphoto2>=2.4.2' 'gnome-keyring>=2.23.90' 'avahi>=0.6.20' 'libarchive>=2.5.5')
 makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 install=gvfs.install
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2
-	bug536614.patch)
-md5sums=('01676053d9481022ade9a5274576541b'
-         '80e6b702f3a28dc3fc3b94b06f4442fd')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.99/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('94d7988c8abc5fc5d99807203170475b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np2 -i ${srcdir}/bug536614.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/gvfs || return 1

Deleted: bug536614.patch
===================================================================
--- bug536614.patch	2008-08-24 06:28:24 UTC (rev 10142)
+++ bug536614.patch	2008-08-24 06:37:07 UTC (rev 10143)
@@ -1,47 +0,0 @@
---- branches/gnome-2-22/client/gvfsfusedaemon.c	2008/05/23 03:22:22	1784
-+++ branches/gnome-2-22/client/gvfsfusedaemon.c	2008/07/18 23:18:04	1821
-@@ -313,9 +313,11 @@
-                                      (gpointer *) &fh))
-       goto out;
- 
-+  g_hash_table_steal (global_fh_table, old_path);
-+
-   g_free (fh->path);
-   fh->path = g_strdup (new_path);
--  g_hash_table_steal (global_fh_table, old_path);
-+
-   g_hash_table_insert (global_fh_table, fh->path, fh);
- 
-  out:
-@@ -959,11 +961,15 @@
- 
-               /* Set up a stream here, so we can check for errors */
- 
-+              g_mutex_lock (fh->mutex);
-+
-               if (fi->flags & O_WRONLY || fi->flags & O_RDWR)
-                 result = setup_output_stream (file, fh);
-               else
-                 result = setup_input_stream (file, fh);
- 
-+              g_mutex_unlock (fh->mutex);
-+
-               /* The added reference to the file handle is released in vfs_release() */
-             }
-           else if (file_type == G_FILE_TYPE_DIRECTORY)
-@@ -1047,11 +1053,14 @@
- 
-               SET_FILE_HANDLE (fi, fh);
- 
--              g_assert (fh->stream == NULL);
-+              g_mutex_lock (fh->mutex);
- 
-+              file_handle_close_stream (fh);
-               fh->stream = file_output_stream;
-               fh->op = FILE_OP_WRITE;
- 
-+              g_mutex_unlock (fh->mutex);
-+
-               /* The added reference to the file handle is released in vfs_release() */
-             }
-           else