* [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0
@ 2009-10-18 21:56 Sven Neumann
2009-10-18 21:56 ` [Buildroot] [PATCH 2/3] gvfs: build archive backend if libarchive is selected Sven Neumann
2009-10-20 20:43 ` [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Sven Neumann @ 2009-10-18 21:56 UTC (permalink / raw)
To: buildroot
Update the gvfs package to the latest upstream release.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
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
diff --git a/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch b/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch
deleted file mode 100644
index cb59221..0000000
--- a/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch
+++ /dev/null
@@ -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)
diff --git a/package/gvfs/gvfs-1.4.0-libsoup-gnome.patch b/package/gvfs/gvfs-1.4.0-libsoup-gnome.patch
new file mode 100644
index 0000000..1fc7944
--- /dev/null
+++ b/package/gvfs/gvfs-1.4.0-libsoup-gnome.patch
@@ -0,0 +1,106 @@
+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" && \
+- { ($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
+@@ -17074,12 +17074,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
+@@ -17090,12 +17090,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
+@@ -17113,14 +17113,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
+
+@@ -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
+-$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
+
+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>
+
+-#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)
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 9a6562b..5c71fef 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -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 = \
--
1.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] gvfs: build archive backend if libarchive is selected
2009-10-18 21:56 [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Sven Neumann
@ 2009-10-18 21:56 ` Sven Neumann
2009-10-18 21:56 ` [Buildroot] [PATCH 3/3] gvfs: explicitly specify samba include and library paths Sven Neumann
2009-10-20 20:43 ` [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Sven Neumann @ 2009-10-18 21:56 UTC (permalink / raw)
To: buildroot
If BR2_PACKAGE_LIBARCHIVE is enabled, build the gvfs archive
backend.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
package/gvfs/gvfs.mk | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 5c71fef..94a5eb7 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -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 += \
--
1.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] gvfs: explicitly specify samba include and library paths
2009-10-18 21:56 ` [Buildroot] [PATCH 2/3] gvfs: build archive backend if libarchive is selected Sven Neumann
@ 2009-10-18 21:56 ` Sven Neumann
0 siblings, 0 replies; 4+ messages in thread
From: Sven Neumann @ 2009-10-18 21:56 UTC (permalink / raw)
To: buildroot
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 <s.neumann@raumfeld.com>
---
package/gvfs/gvfs.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index 94a5eb7..7d71f34 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -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
--
1.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0
2009-10-18 21:56 [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Sven Neumann
2009-10-18 21:56 ` [Buildroot] [PATCH 2/3] gvfs: build archive backend if libarchive is selected Sven Neumann
@ 2009-10-20 20:43 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2009-10-20 20:43 UTC (permalink / raw)
To: buildroot
>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:
Sven> Update the gvfs package to the latest upstream release.
Sven> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Thanks, committed all 3.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-10-20 20:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-18 21:56 [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Sven Neumann
2009-10-18 21:56 ` [Buildroot] [PATCH 2/3] gvfs: build archive backend if libarchive is selected Sven Neumann
2009-10-18 21:56 ` [Buildroot] [PATCH 3/3] gvfs: explicitly specify samba include and library paths Sven Neumann
2009-10-20 20:43 ` [Buildroot] [PATCH 1/3] gvfs: update to version 1.4.0 Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox