[arch-commits] Commit in gnome-vfs/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Thu Sep 25 19:51:40 UTC 2008
Date: Thursday, September 25, 2008 @ 15:51:39
Author: jgc
Revision: 13041
upgpkg: gnome-vfs 2.24.0-1
Modified:
gnome-vfs/trunk/PKGBUILD
Deleted:
gnome-vfs/trunk/gnome-vfs-2.15.1-use-sys-inotify.patch
gnome-vfs/trunk/http-neon-method-youtube.patch
----------------------------------------+
PKGBUILD | 16 ++----
gnome-vfs-2.15.1-use-sys-inotify.patch | 74 ----------------------------
http-neon-method-youtube.patch | 80 -------------------------------
3 files changed, 6 insertions(+), 164 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-09-25 19:45:49 UTC (rev 13040)
+++ PKGBUILD 2008-09-25 19:51:39 UTC (rev 13041)
@@ -2,12 +2,12 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-vfs
-pkgver=2.22.0
-pkgrel=4
+pkgver=2.24.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.24' '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.24/gnome-vfs-${pkgver}.tar.bz2
+ hal-show-volume-names.patch)
+md5sums=('870ee8861bfcaeb852934e95657ef83e' '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: gnome-vfs-2.15.1-use-sys-inotify.patch
===================================================================
--- gnome-vfs-2.15.1-use-sys-inotify.patch 2008-09-25 19:45:49 UTC (rev 13040)
+++ gnome-vfs-2.15.1-use-sys-inotify.patch 2008-09-25 19:51:39 UTC (rev 13041)
@@ -1,74 +0,0 @@
---- gnome-vfs-2.15.1/modules/inotify-helper.c.use-sys-inotify 2006-05-17 13:27:10.000000000 -0400
-+++ gnome-vfs-2.15.1/modules/inotify-helper.c 2006-05-17 13:27:51.000000000 -0400
-@@ -28,19 +28,11 @@
- #include <time.h>
- #include <string.h>
- #include <sys/ioctl.h>
--/* Just include the local header to stop all the pain */
--#include "local_inotify.h"
--#if 0
- #ifdef HAVE_SYS_INOTIFY_H
--/* We don't actually include the libc header, because there has been
-- * problems with libc versions that was built without inotify support.
-- * Instead we use the local version.
-- */
--#include "local_inotify.h"
-+#include <sys/inotify.h>
- #elif defined (HAVE_LINUX_INOTIFY_H)
- #include <linux/inotify.h>
- #endif
--#endif
- #include <libgnomevfs/gnome-vfs-module-shared.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
- #include "inotify-helper.h"
---- gnome-vfs-2.15.1/modules/inotify-kernel.c.use-sys-inotify 2006-05-17 13:27:10.000000000 -0400
-+++ gnome-vfs-2.15.1/modules/inotify-kernel.c 2006-05-17 13:28:33.000000000 -0400
-@@ -24,22 +24,12 @@
- #include <glib.h>
- #include "inotify-kernel.h"
-
--/* Just include the local headers to stop all the pain */
--#include "local_inotify.h"
--#include "local_inotify_syscalls.h"
--#if 0
- #ifdef HAVE_SYS_INOTIFY_H
--/* We don't actually include the libc header, because there has been
-- * problems with libc versions that was built without inotify support.
-- * Instead we use the local version.
-- */
--#include "local_inotify.h"
--#include "local_inotify_syscalls.h"
-+#include <sys/inotify.h>
- #elif defined (HAVE_LINUX_INOTIFY_H)
- #include <linux/inotify.h>
- #include "local_inotify_syscalls.h"
- #endif
--#endif
-
- /* Timings for pairing MOVED_TO / MOVED_FROM events */
- #define PROCESS_EVENTS_TIME 125 /* milliseconds */
---- gnome-vfs-2.15.1/modules/inotify-path.c.use-sys-inotify 2006-05-17 13:27:10.000000000 -0400
-+++ gnome-vfs-2.15.1/modules/inotify-path.c 2006-05-17 13:50:50.000000000 -0400
-@@ -28,18 +28,14 @@
- /* Don't put conflicting kernel types in the global namespace: */
- #define __KERNEL_STRICT_NAMES
-
--#include "local_inotify.h"
--#if 0
- #ifdef HAVE_SYS_INOTIFY_H
--/* We don't actually include the libc header, because there has been
-- * problems with libc versions that was built without inotify support.
-- * Instead we use the local version.
-- */
--#include "local_inotify.h"
-+#include <sys/inotify.h>
-+#ifndef IN_ONLYDIR
-+#define IN_ONLYDIR 0x01000000
-+#endif
- #elif defined (HAVE_LINUX_INOTIFY_H)
- #include <linux/inotify.h>
- #endif
--#endif
- #include <string.h>
- #include <glib.h>
- #include <libgnomevfs/gnome-vfs-module-shared.h>
Deleted: http-neon-method-youtube.patch
===================================================================
--- http-neon-method-youtube.patch 2008-09-25 19:45:49 UTC (rev 13040)
+++ http-neon-method-youtube.patch 2008-09-25 19:51:39 UTC (rev 13041)
@@ -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);
More information about the arch-commits
mailing list