diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-28 17:31:36 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-01-28 17:33:03 +0100 |
| commit | 57e0f540ffd2133e6540a0faea32663a2731e2ae (patch) | |
| tree | c703a627280eb2d6bdae78c60221877c6bb69a9e /package/gvfs | |
| parent | 98d5d81a1dfccdd09c29b18aac19b6331d07fabc (diff) | |
Revert "Revert "gvfs: update to version 1.4.0""
This reverts commit 70ce96305cb19254576f670e896a66f3e3ba6eff.
Now that we have glib2 2.22.4, we can take the gvfs 1.4.0 update.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/gvfs')
| -rw-r--r-- | package/gvfs/gvfs-1.4.0-libsoup-gnome.patch (renamed from package/gvfs/gvfs-1.2.2-libsoup-gnome.patch) | 20 | ||||
| -rw-r--r-- | package/gvfs/gvfs.mk | 7 |
2 files changed, 14 insertions, 13 deletions
diff --git a/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch b/package/gvfs/gvfs-1.4.0-libsoup-gnome.patch index cb59221da..1fc7944c1 100644 --- a/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch +++ b/package/gvfs/gvfs-1.4.0-libsoup-gnome.patch @@ -1,6 +1,7 @@ ---- gvfs-1.2.2-orig/configure 2009-04-13 19:30:57.000000000 +0200 -+++ gvfs-1.2.2/configure 2009-05-25 11:49:31.000000000 +0200 -@@ -25645,8 +25645,8 @@ +diff -ur gvfs-1.4.0-orig/configure gvfs-1.4.0/configure +--- gvfs-1.4.0-orig/configure 2009-09-21 16:33:27.000000000 +0200 ++++ gvfs-1.4.0/configure 2009-10-18 13:28:02.000000000 +0200 +@@ -17056,8 +17056,8 @@ if test "x$enable_http" != "xno"; then if test -n "$PKG_CONFIG" && \ @@ -11,7 +12,7 @@ ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -@@ -25663,12 +25663,12 @@ +@@ -17074,12 +17074,12 @@ pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ @@ -27,7 +28,7 @@ else pkg_failed=yes fi -@@ -25679,12 +25679,12 @@ +@@ -17090,12 +17090,12 @@ pkg_cv_HTTP_LIBS="$HTTP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ @@ -43,7 +44,7 @@ else pkg_failed=yes fi -@@ -25702,14 +25702,14 @@ +@@ -17113,14 +17113,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -61,7 +62,7 @@ $HTTP_PKG_ERRORS -@@ -25720,7 +25720,7 @@ +@@ -17131,7 +17131,7 @@ and HTTP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 @@ -70,8 +71,9 @@ $HTTP_PKG_ERRORS ---- gvfs-1.2.2-orig/daemon/gvfsbackendhttp.c 2009-03-06 16:43:19.000000000 +0100 -+++ gvfs-1.2.2/daemon/gvfsbackendhttp.c 2009-05-25 11:48:20.000000000 +0200 +diff -ur gvfs-1.4.0-orig/daemon/gvfsbackendhttp.c gvfs-1.4.0/daemon/gvfsbackendhttp.c +--- gvfs-1.4.0-orig/daemon/gvfsbackendhttp.c 2009-04-20 12:41:37.000000000 +0200 ++++ gvfs-1.4.0/daemon/gvfsbackendhttp.c 2009-10-18 13:28:02.000000000 +0200 @@ -33,7 +33,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index cf28862b5..64e6df476 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -3,18 +3,17 @@ # gvfs # ############################################################# -GVFS_VERSION_MAJOR = 1.2 -GVFS_VERSION_MINOR = 2 +GVFS_VERSION_MAJOR = 1.4 +GVFS_VERSION_MINOR = 0 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR) GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) - GVFS_INSTALL_STAGING = NO GVFS_INSTALL_TARGET = YES GVFS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install - GVFS_AUTORECONF = NO GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus-glib shared-mime-info +GVFS_LIBTOOL_PATCH = NO GVFS_CONF_OPT = \ --disable-gconf \ |