diff options
author | Sven Neumann <s.neumann@raumfeld.com> | 2009-09-27 23:19:40 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-27 23:21:50 +0200 |
commit | bc95b3ad3b02cc23d9efd89654b52492e492b959 (patch) | |
tree | eaf1dac6224fb20369002954d39bda3bcf5990cf /package/gvfs/gvfs-1.2.2-libsoup-gnome.patch | |
parent | 255c8ea89c50a7ebc25d0202aef6f6ae53afdd51 (diff) |
package: add gvfs
Closes #303.
Peter: Fix Kconfig (largefile, expat, indentation)
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/gvfs/gvfs-1.2.2-libsoup-gnome.patch')
-rw-r--r-- | package/gvfs/gvfs-1.2.2-libsoup-gnome.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch b/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch new file mode 100644 index 000000000..cb59221da --- /dev/null +++ b/package/gvfs/gvfs-1.2.2-libsoup-gnome.patch @@ -0,0 +1,104 @@ +--- 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) |