[arch-commits] Commit in gnome-vfs/repos/gnome-i686 (2 files)

[Jan de Groot]

    Date: Saturday, August 23, 2008 @ 10:22:29
  Author: jgc
Revision: 10049

gnome-vfs 2.23.0 - GNOME 2.23.90

Modified:
  gnome-vfs/repos/gnome-i686/PKGBUILD
Deleted:
  gnome-vfs/repos/gnome-i686/http-neon-method-youtube.patch

--------------------------------+
 PKGBUILD                       |   16 ++-----
 http-neon-method-youtube.patch |   80 ---------------------------------------
 2 files changed, 6 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-23 14:13:45 UTC (rev 10048)
+++ PKGBUILD	2008-08-23 14:22:29 UTC (rev 10049)
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-vfs
-pkgver=2.22.0
-pkgrel=4
+pkgver=2.23.0
+pkgrel=1
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.22.0' 'hal>=0.5.10' 'bzip2' 'avahi>=0.6.23' 'smbclient>=3.0.30' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2' 'gnutls>=2.4.1')
+depends=('fam' 'gconf>=2.23.2' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.23' 'smbclient>=3.0.31' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2' 'gnutls>=2.4.1')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 conflicts=(gnome-vfs-samba)
@@ -15,19 +15,15 @@
 replaces=(gnome-vfs-samba gnome-vfs-extras)
 url="http://www.gnome.org"
 install=gnome-vfs.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/gnome-vfs-${pkgver}.tar.bz2
-	hal-show-volume-names.patch
-	http-neon-method-youtube.patch)
-md5sums=('369105fd82cb99e69e63acab8f3b89b7' '109d07aa1dc8cb6523c47c4984047dce'\
-         'a980d7abfbf483b25e2a93bfb868b758')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.23/gnome-vfs-${pkgver}.tar.bz2
+	hal-show-volume-names.patch)
+md5sums=('c1650c4432d2af7c0c05e2b75c4c19d0' '109d07aa1dc8cb6523c47c4984047dce')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   #Archlinux patch (b.g.o #321498)
   patch -Np1 -i ${startdir}/src/hal-show-volume-names.patch || return 1
 
-  patch -Np1 -i ${startdir}/src/http-neon-method-youtube.patch || return 1
-
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var --disable-static \
 	--libexecdir=/usr/lib/gnome-vfs-2.0 \

Deleted: http-neon-method-youtube.patch
===================================================================
--- http-neon-method-youtube.patch	2008-08-23 14:13:45 UTC (rev 10048)
+++ http-neon-method-youtube.patch	2008-08-23 14:22:29 UTC (rev 10049)
@@ -1,80 +0,0 @@
---- trunk/modules/http-neon-method.c	2008/02/15 05:17:33	5446
-+++ trunk/modules/http-neon-method.c	2008/03/21 11:21:39	5467
-@@ -1773,6 +1773,25 @@
- 	return GNOME_VFS_OK;
- }
- 
-+static gboolean
-+http_context_host_matches (HttpContext *context, const char *glob)
-+{
-+        GnomeVFSToplevelURI *uri;
-+        GPatternSpec *spec;
-+        gboolean res;
-+
-+        uri = gnome_vfs_uri_get_toplevel (context->uri);
-+
-+        if (uri == NULL ||  uri->host_name == NULL || glob == NULL)
-+                return FALSE;
-+
-+        spec = g_pattern_spec_new (glob);
-+        res = g_pattern_match_string (spec, uri->host_name);
-+        g_pattern_spec_free (spec);
-+
-+        return res;
-+}
-+
- static GnomeVFSResult
- http_follow_redirect (HttpContext *context)
- {
-@@ -2255,7 +2274,7 @@
- 	hctx = handle->context;
- 	
- get_start:	
--	req  = ne_request_create (hctx->session, "GET", hctx->path);
-+	req = ne_request_create (hctx->session, "GET", hctx->path);
- 	
- 	if (handle->use_range) {
- 		
-@@ -2330,8 +2349,8 @@
- 
- 		handle->transfer_state = TRANSFER_READ;
- 		handle->transfer.read = req;
--	}
--	
-+	} 
-+
- 	return result;
- }
- 
-@@ -2347,6 +2366,20 @@
- 	return GNOME_VFS_ERROR_INTERNAL;
- }
- 
-+/* TRUE means we can range, ie server is sane, FALSE means FAIL */
-+static gboolean
-+i_can_haz_range_cause_serverz_not_br0ken (HttpContext *hctx)
-+{
-+        gboolean br0ken = FALSE;
-+
-+        if (http_context_host_matches (hctx, "*youtube.*")) {
-+                DEBUG_HTTP ("Youtube detected! Cannot use ranged gets");
-+                br0ken = TRUE;
-+        }
-+
-+        return br0ken == FALSE;
-+}
-+
- /* ************************************************************************** */
- 
- static GnomeVFSResult
-@@ -2402,8 +2435,8 @@
- 			return result;
- 		} 
- 	} else {
--                /* Always try to make Ranged puts */
--		handle->use_range = TRUE;
-+		handle->use_range = i_can_haz_range_cause_serverz_not_br0ken (hctx);
-+                DEBUG_HTTP ("Use range: %s\n", handle->use_range ? "on" : "off");
- 	}
- 
- 	result = http_transfer_start (handle);