gvfs: update to version 1.4.0
PATCH 1/3 gvfs: update to version 1.4.0
Update the gvfs package to the latest upstream release.
Signed-off-by Sven Neumann <[email protected]>
--- package/gvfs/gvfs-1.2.2-libsoup-gnome.patch | 104 -------------------------- package/gvfs/gvfs-1.4.0-libsoup-gnome.patch | 106 +++++++++++++++++++++++++++ package/gvfs/gvfs.mk | 8 +- 3 files changed, 110 insertions(+), 108 deletions(-) delete mode 100644 package/gvfs/gvfs-1.2.2-libsoup-gnome.patch create mode 100644 package/gvfs/gvfs-1.4.0-libsoup-gnome.patch
package/gvfs/gvfs-1.2.2-libsoup-gnome.patch deleted +0 -104
@@ -1,104 +0,0 @@ ---- 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 @@ - - if test "x$enable_http" != "xno"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.25.1\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.25.1") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.25.1\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.25.1") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -25663,12 +25663,12 @@ - pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null` -+ pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 libxml-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -25679,12 +25679,12 @@ - pkg_cv_HTTP_LIBS="$HTTP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null` -+ pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 libxml-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -25702,14 +25702,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-gnome-2.4 libxml-2.0" 2>&1` -+ HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 libxml-2.0" 2>&1` - else -- HTTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-gnome-2.4 libxml-2.0" 2>&1` -+ HTTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 libxml-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$HTTP_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 libxml-2.0) were not met: - - $HTTP_PKG_ERRORS - -@@ -25720,7 +25720,7 @@ - and HTTP_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met: -+$as_echo "$as_me: error: Package requirements (libsoup-2.4 libxml-2.0) were not met: - - $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 -@@ -33,7 +33,7 @@ - #include <glib/gi18n.h> - #include <gio/gio.h> - --#include <libsoup/soup-gnome.h> -+#include <libsoup/soup.h> - #include "gvfsbackendhttp.h" - #include "gvfsjobopenforread.h" - #include "gvfsjobread.h" -@@ -80,7 +80,6 @@ - g_vfs_backend_http_init (GVfsBackendHttp *backend) - { - const char *debug; -- SoupSessionFeature *proxy_resolver; - - g_vfs_backend_set_user_visible (G_VFS_BACKEND (backend), FALSE); - -@@ -92,12 +91,6 @@ - "gvfs/" VERSION, - NULL); - -- /* Proxy handling */ -- proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_GNOME, NULL); -- soup_session_add_feature (backend->session, proxy_resolver); -- soup_session_add_feature (backend->session_async, proxy_resolver); -- g_object_unref (proxy_resolver); -- - /* Logging */ - debug = g_getenv ("GVFS_HTTP_DEBUG"); - if (debug)
package/gvfs/gvfs-1.4.0-libsoup-gnome.patch new file +106 -0
106 lines not on this page · raw message
package/gvfs/gvfs.mk +4 -4
@@ -3,17 +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_LIBTOOL_PATCH = NO + GVFS_DEPENDENCIES = uclibc host-pkgconfig host-libglib2 libglib2 dbus-glib shared-mime-info GVFS_CONF_OPT = \
Signature · 1 line
1.6.5
PATCH 2/3 gvfs: build archive backend if libarchive is selected
If BR2_PACKAGE_LIBARCHIVE is enabled, build the gvfs archive backend.
Signed-off-by Sven Neumann <[email protected]>
--- package/gvfs/gvfs.mk | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-)
package/gvfs/gvfs.mk +14 -8
@@ -22,7 +22,6 @@ GVFS_CONF_OPT = \ --disable-obexftp \ --disable-gphoto2 \ --disable-keyring \ - --disable-archive \ --disable-bash-completion \ ifeq ($(BR2_PACKAGE_AVAHI),y)
@@ -32,6 +31,20 @@ else GVFS_CONF_OPT += --disable-avahi endif +ifeq ($(BR2_PACKAGE_HAL),y) +GVFS_DEPENDENCIES += hal +GVFS_CONF_OPT += --enable-hal +else +GVFS_CONF_OPT += --disable-hal +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +GVFS_DEPENDENCIES += libarchive +GVFS_CONF_OPT += --enable-archive +else +GVFS_CONF_OPT += --disable-archive +endif + ifeq ($(BR2_PACKAGE_LIBFUSE),y) GVFS_DEPENDENCIES += libfuse GVFS_CONF_OPT += --enable-fuse
@@ -46,13 +59,6 @@ else GVFS_CONF_OPT += --disable-http endif -ifeq ($(BR2_PACKAGE_HAL),y) -GVFS_DEPENDENCIES += hal -GVFS_CONF_OPT += --enable-hal -else -GVFS_CONF_OPT += --disable-hal -endif - ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y) GVFS_DEPENDENCIES += samba GVFS_CONF_OPT += \
Signature · 1 line
1.6.5
PATCH 3/3 gvfs: explicitly specify samba include and library paths
The gvfs configure script has --with-samba-includes and --with-samba-libs options. Use these to point it to the libsmbclient files in the staging dir.
Signed-off-by Sven Neumann <[email protected]>
--- package/gvfs/gvfs.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/gvfs/gvfs.mk +2 -0
@@ -63,6 +63,8 @@ ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y) GVFS_DEPENDENCIES += samba GVFS_CONF_OPT += \ --enable-samba \ + --with-samba-includes=$(STAGING_DIR)/usr/include \ + --with-samba-libs=$(STAGING_DIR)/usr/lib \ ac_cv_lib_smbclient_smbc_option_get=yes else GVFS_CONF_OPT += --disable-samba
Signature · 1 line
1.6.5
PATCH 1/3 gvfs: update to version 1.4.0
In reply to Sven NeumannQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sven" == Sven Neumann <[email protected]> writes:
Sven> Update the gvfs package to the latest upstream release. Sven> Signed-off-by: Sven Neumann <[email protected]>
Thanks, committed all 3.
Signature · 1 line
Bye, Peter Korsgaard