Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2d77cda79c4ea644867a507c9d7bd9ab6c68ec7
commit f2d77cda79c4ea644867a507c9d7bd9ab6c68ec7 Author: bouleetbil <bouleet...@frogdev.info> Date: Mon Jul 13 10:42:21 2009 +0200 gvfs-1.2.3-3-i686 *really closed #3845 *disable proxy support diff --git a/source/xapps/gvfs/FrugalBuild b/source/xapps/gvfs/FrugalBuild index e375ed5..84c61c7 100644 --- a/source/xapps/gvfs/FrugalBuild +++ b/source/xapps/gvfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gvfs pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/"; depends=('glib2>=2.20.1' 'dbus' 'avahi-glib' 'avahi' 'hal') @@ -13,7 +13,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup>=2.26.0' 'gcon groups=('xapps') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4') +source=($source gvfs-libsoup.diff) +sha1sums=('c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4' \ + '1eb9391f6bf3716ddc8fbf75340257e537c61199') subpkgs=("gvfs-gconf") subdescs=('gvfs with gconf support for Gnome') @@ -23,11 +25,10 @@ subarchs=('i686 x86_64 ppc') build(){ Fcd - Fsed "libsoup-gnome" "libsoup" configure.ac - Fsed "soup-gnome.h" "soup.h" daemon/gvfsbackendhttp.c - Fsed "SOUP_TYPE_PROXY_RESOLVER_GNOME" "SOUP_TYPE_PROXY_RESOLVER" daemon/gvfsbackendhttp.c + Fpatchall Fautoreconf - Fbuild + Fmake + Fmakeinstall Fsplit gvfs-gconf /usr/lib/gio/modules/libgiogconf* } diff --git a/source/xapps/gvfs/gvfs-libsoup.diff b/source/xapps/gvfs/gvfs-libsoup.diff new file mode 100644 index 0000000..5437816 --- /dev/null +++ b/source/xapps/gvfs/gvfs-libsoup.diff @@ -0,0 +1,43 @@ +diff -Naur gvfs-1.2.3/configure.ac gvfs-1.2.3.new/configure.ac +--- gvfs-1.2.3/configure.ac 2009-05-18 17:24:03.000000000 +0530 ++++ gvfs-1.2.3.new/configure.ac 2009-07-13 11:26:23.000000000 +0530 +@@ -130,6 +130,11 @@ + if test "x$msg_http" = "xyes"; then + PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0) + AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built]) ++ AC_DEFINE(HAVE_LIBSOUP_GNOME, 1,[Define to 1 if libsoup-gnome is used]) ++ else ++ PKG_CHECK_EXISTS(libsoup-2.4 >= 2.25.1, msg_http=yes) ++ PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0) ++ AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built]) + fi + fi + +diff -Naur gvfs-1.2.3/daemon/gvfsbackendhttp.c gvfs-1.2.3.new/daemon/gvfsbackendhttp.c +--- gvfs-1.2.3/daemon/gvfsbackendhttp.c 2009-04-20 16:11:37.000000000 +0530 ++++ gvfs-1.2.3.new/daemon/gvfsbackendhttp.c 2009-07-13 11:27:14.000000000 +0530 +@@ -33,7 +33,10 @@ + #include <glib/gi18n.h> + #include <gio/gio.h> + ++#ifdef HAVE_LIBSOUP_GNOME + #include <libsoup/soup-gnome.h> ++#endif ++ + #include "gvfsbackendhttp.h" + #include "gvfsjobopenforread.h" + #include "gvfsjobread.h" +@@ -92,11 +95,13 @@ + "gvfs/" VERSION, + NULL); + ++#ifdef HAVE_LIBSOUP_GNOME + /* 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); ++#endif + + /* Logging */ + debug = g_getenv ("GVFS_HTTP_DEBUG"); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
