gvfs-1.2.2-libsoup-gnome.patch 4.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
  1. --- gvfs-1.2.2-orig/configure 2009-04-13 19:30:57.000000000 +0200
  2. +++ gvfs-1.2.2/configure 2009-05-25 11:49:31.000000000 +0200
  3. @@ -25645,8 +25645,8 @@
  4. if test "x$enable_http" != "xno"; then
  5. if test -n "$PKG_CONFIG" && \
  6. - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.25.1\"") >&5
  7. - ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.25.1") 2>&5
  8. + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.25.1\"") >&5
  9. + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.25.1") 2>&5
  10. ac_status=$?
  11. $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  12. (exit $ac_status); }; then
  13. @@ -25663,12 +25663,12 @@
  14. pkg_cv_HTTP_CFLAGS="$HTTP_CFLAGS"
  15. elif test -n "$PKG_CONFIG"; then
  16. if test -n "$PKG_CONFIG" && \
  17. - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\"") >&5
  18. - ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5
  19. + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5
  20. + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5
  21. ac_status=$?
  22. $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  23. (exit $ac_status); }; then
  24. - pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null`
  25. + pkg_cv_HTTP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 libxml-2.0" 2>/dev/null`
  26. else
  27. pkg_failed=yes
  28. fi
  29. @@ -25679,12 +25679,12 @@
  30. pkg_cv_HTTP_LIBS="$HTTP_LIBS"
  31. elif test -n "$PKG_CONFIG"; then
  32. if test -n "$PKG_CONFIG" && \
  33. - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 libxml-2.0\"") >&5
  34. - ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 libxml-2.0") 2>&5
  35. + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 libxml-2.0\"") >&5
  36. + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 libxml-2.0") 2>&5
  37. ac_status=$?
  38. $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  39. (exit $ac_status); }; then
  40. - pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-gnome-2.4 libxml-2.0" 2>/dev/null`
  41. + pkg_cv_HTTP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 libxml-2.0" 2>/dev/null`
  42. else
  43. pkg_failed=yes
  44. fi
  45. @@ -25702,14 +25702,14 @@
  46. _pkg_short_errors_supported=no
  47. fi
  48. if test $_pkg_short_errors_supported = yes; then
  49. - HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-gnome-2.4 libxml-2.0" 2>&1`
  50. + HTTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 libxml-2.0" 2>&1`
  51. else
  52. - HTTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-gnome-2.4 libxml-2.0" 2>&1`
  53. + HTTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 libxml-2.0" 2>&1`
  54. fi
  55. # Put the nasty error message in config.log where it belongs
  56. echo "$HTTP_PKG_ERRORS" >&5
  57. - { { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met:
  58. + { { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 libxml-2.0) were not met:
  59. $HTTP_PKG_ERRORS
  60. @@ -25720,7 +25720,7 @@
  61. and HTTP_LIBS to avoid the need to call pkg-config.
  62. See the pkg-config man page for more details.
  63. " >&5
  64. -$as_echo "$as_me: error: Package requirements (libsoup-gnome-2.4 libxml-2.0) were not met:
  65. +$as_echo "$as_me: error: Package requirements (libsoup-2.4 libxml-2.0) were not met:
  66. $HTTP_PKG_ERRORS
  67. --- gvfs-1.2.2-orig/daemon/gvfsbackendhttp.c 2009-03-06 16:43:19.000000000 +0100
  68. +++ gvfs-1.2.2/daemon/gvfsbackendhttp.c 2009-05-25 11:48:20.000000000 +0200
  69. @@ -33,7 +33,7 @@
  70. #include <glib/gi18n.h>
  71. #include <gio/gio.h>
  72. -#include <libsoup/soup-gnome.h>
  73. +#include <libsoup/soup.h>
  74. #include "gvfsbackendhttp.h"
  75. #include "gvfsjobopenforread.h"
  76. #include "gvfsjobread.h"
  77. @@ -80,7 +80,6 @@
  78. g_vfs_backend_http_init (GVfsBackendHttp *backend)
  79. {
  80. const char *debug;
  81. - SoupSessionFeature *proxy_resolver;
  82. g_vfs_backend_set_user_visible (G_VFS_BACKEND (backend), FALSE);
  83. @@ -92,12 +91,6 @@
  84. "gvfs/" VERSION,
  85. NULL);
  86. - /* Proxy handling */
  87. - proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_GNOME, NULL);
  88. - soup_session_add_feature (backend->session, proxy_resolver);
  89. - soup_session_add_feature (backend->session_async, proxy_resolver);
  90. - g_object_unref (proxy_resolver);
  91. -
  92. /* Logging */
  93. debug = g_getenv ("GVFS_HTTP_DEBUG");
  94. if (debug)