diff options
Diffstat (limited to 'package/gvfs/gvfs-1.4.0-libsoup-gnome.patch')
| -rw-r--r-- | package/gvfs/gvfs-1.4.0-libsoup-gnome.patch | 106 |
1 files changed, 106 insertions, 0 deletions
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 000000000..1fc7944c1 --- /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) |