gvfs: update to 1.7.3

diff --git a/recipes/gnome/gvfs-1.7.3/deprecated.patch b/recipes/gnome/gvfs-1.7.3/deprecated.patch
new file mode 100644 (file)
index 0000000..5b143cb
--- /dev/null
+++ b/recipes/gnome/gvfs-1.7.3/deprecated.patch
@@ -0,0 +1,98 @@
+diff -urp gvfs-1.7.3_/daemon/Makefile.am gvfs-1.7.3/daemon/Makefile.am
+--- gvfs-1.7.3_/daemon/Makefile.am     2014-10-11 05:13:56.554551790 +0300
++++ gvfs-1.7.3/daemon/Makefile.am      2014-10-11 05:15:04.807677094 +0300
+@@ -16,8 +16,7 @@ INCLUDES =                                   \
+       -DG_UDEV_API_IS_SUBJECT_TO_CHANGE       \
+       -DLIBEXEC_DIR=\"$(libexecdir)/\"        \
+       -DMOUNTABLE_DIR=\"$(mountdir)/\"        \
+-      -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+-      -DG_DISABLE_DEPRECATED
++      -DGVFS_LOCALEDIR=\""$(localedir)"\"
+ 
+ noinst_LTLIBRARIES=libdaemon.la
+ 
+diff -urp gvfs-1.7.3_/daemon/Makefile.in gvfs-1.7.3/daemon/Makefile.in
+--- gvfs-1.7.3_/daemon/Makefile.in     2014-10-11 05:13:56.554551790 +0300
++++ gvfs-1.7.3/daemon/Makefile.in      2014-10-11 05:15:12.839338527 +0300
+@@ -577,8 +577,7 @@ INCLUDES = \
+       -DG_UDEV_API_IS_SUBJECT_TO_CHANGE       \
+       -DLIBEXEC_DIR=\"$(libexecdir)/\"        \
+       -DMOUNTABLE_DIR=\"$(mountdir)/\"        \
+-      -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+-      -DG_DISABLE_DEPRECATED
++      -DGVFS_LOCALEDIR=\""$(localedir)"\"
+ 
+ noinst_LTLIBRARIES = libdaemon.la
+ libraries = \
+diff -urp gvfs-1.7.3_/metadata/Makefile.am gvfs-1.7.3/metadata/Makefile.am
+--- gvfs-1.7.3_/metadata/Makefile.am   2014-10-11 05:13:56.546551891 +0300
++++ gvfs-1.7.3/metadata/Makefile.am    2014-10-11 05:14:25.957312854 +0300
+@@ -23,7 +23,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
+       $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+-      -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++      -DG_LOG_DOMAIN=\"GVFS\" \
+       -DDBUS_API_SUBJECT_TO_CHANGE
+ 
+ libmetadata_la_SOURCES =              \
+diff -urp gvfs-1.7.3_/metadata/Makefile.in gvfs-1.7.3/metadata/Makefile.in
+--- gvfs-1.7.3_/metadata/Makefile.in   2014-10-11 05:13:56.546551891 +0300
++++ gvfs-1.7.3/metadata/Makefile.in    2014-10-11 05:14:18.049646409 +0300
+@@ -360,7 +360,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
+       $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+-      -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++      -DG_LOG_DOMAIN=\"GVFS\" \
+       -DDBUS_API_SUBJECT_TO_CHANGE
+ 
+ libmetadata_la_SOURCES = \
+diff -urp gvfs-1.7.3_/client/Makefile.am gvfs-1.7.3/client/Makefile.am
+--- gvfs-1.7.3_/client/Makefile.am     2014-10-11 05:26:37.777161464 +0300
++++ gvfs-1.7.3/client/Makefile.am      2014-10-11 05:27:28.754759444 +0300
+@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) \
+       -I$(top_srcdir)/metadata \
+       -I$(top_srcdir)/common \
+       $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+-      -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++      -DG_LOG_DOMAIN=\"GVFS\" \
+       -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"    \
+       -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+       -DDBUS_API_SUBJECT_TO_CHANGE
+diff -urp gvfs-1.7.3_/client/Makefile.in gvfs-1.7.3/client/Makefile.in
+--- gvfs-1.7.3_/client/Makefile.in     2014-10-11 05:26:37.777161464 +0300
++++ gvfs-1.7.3/client/Makefile.in      2014-10-11 05:27:21.907082064 +0300
+@@ -363,7 +363,7 @@ INCLUDES = -I$(top_srcdir) \
+       -I$(top_srcdir)/metadata \
+       -I$(top_srcdir)/common \
+       $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+-      -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++      -DG_LOG_DOMAIN=\"GVFS\" \
+       -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"    \
+       -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+       -DDBUS_API_SUBJECT_TO_CHANGE
+diff -urp gvfs-1.7.3_/client/Makefile.am gvfs-1.7.3/client/Makefile.am
+--- gvfs-1.7.3_/client/Makefile.am     2014-10-11 05:34:52.617844541 +0300
++++ gvfs-1.7.3/client/Makefile.am      2014-10-11 05:35:13.164876216 +0300
+@@ -73,7 +73,7 @@ gvfs_fuse_daemon_CFLAGS = \
+       -I$(top_srcdir) \
+         -I$(top_srcdir)/common \
+         $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
+-        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+         -DDBUS_API_SUBJECT_TO_CHANGE
+ 
+ gvfs_fuse_daemon_LDADD = \
+diff -urp gvfs-1.7.3_/client/Makefile.in gvfs-1.7.3/client/Makefile.in
+--- gvfs-1.7.3_/client/Makefile.in     2014-10-11 05:34:52.617844541 +0300
++++ gvfs-1.7.3/client/Makefile.in      2014-10-11 05:35:07.221156454 +0300
+@@ -415,7 +415,7 @@ test_uri_utils_CFLAGS = $(INCLUDES)
+ @USE_FUSE_TRUE@       -I$(top_srcdir) \
+ @USE_FUSE_TRUE@        -I$(top_srcdir)/common \
+ @USE_FUSE_TRUE@        $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
+-@USE_FUSE_TRUE@        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++@USE_FUSE_TRUE@        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+ @USE_FUSE_TRUE@        -DDBUS_API_SUBJECT_TO_CHANGE
+ 
+ @USE_FUSE_TRUE@gvfs_fuse_daemon_LDADD = \

diff --git a/recipes/gnome/gvfs-1.7.3/gthreads_supported.patch b/recipes/gnome/gvfs-1.7.3/gthreads_supported.patch
new file mode 100644 (file)
index 0000000..f51bd70
--- /dev/null
+++ b/recipes/gnome/gvfs-1.7.3/gthreads_supported.patch
@@ -0,0 +1,24 @@
+diff -urp gvfs-1.7.3_/client/gdaemonvfs.c gvfs-1.7.3/client/gdaemonvfs.c
+--- gvfs-1.7.3_/client/gdaemonvfs.c    2014-10-11 05:20:32.767990746 +0300
++++ gvfs-1.7.3/client/gdaemonvfs.c     2014-10-11 05:21:11.350869943 +0300
+@@ -299,7 +299,7 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
+   bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   
+-  if (g_thread_supported ())
++  //if (g_thread_supported ())
+     dbus_threads_init_default ();
+ 
+   vfs->async_bus = dbus_bus_get_private (DBUS_BUS_SESSION, NULL);
+diff -urp gvfs-1.7.3_/common/gmounttracker.c gvfs-1.7.3/common/gmounttracker.c
+--- gvfs-1.7.3_/common/gmounttracker.c 2014-10-11 05:20:32.744004404 +0300
++++ gvfs-1.7.3/common/gmounttracker.c  2014-10-11 05:21:05.805905363 +0300
+@@ -528,7 +528,7 @@ init_connection (GMountTracker *tracker)
+ static void
+ g_mount_tracker_init (GMountTracker *tracker)
+ {
+-  if (g_thread_supported ())
++  //if (g_thread_supported ())
+     tracker->lock = g_mutex_new ();
+ }
+ 

diff --git a/recipes/gnome/gvfs_1.7.3.bb b/recipes/gnome/gvfs_1.7.3.bb
new file mode 100644 (file)
index 0000000..6cb6253
--- /dev/null
+++ b/recipes/gnome/gvfs_1.7.3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPLv2"
+DEPENDS = "libcdio gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2"
+
+inherit gnome
+
+SRC_URI += "file://deprecated.patch;patch=1 \
+           file://gthreads_supported.patch;patch=1"
+
+SRC_URI[archive.md5sum] = "f6970ed6dd5378c59df9588bf0e04ffa"
+SRC_URI[archive.sha256sum] = "be3e2e48ffbb5a2d6eed0f7769318b944a751cbb614fe7f153adf8cb2f4ac6a0"
+
+EXTRA_OECONF = "--enable-samba  --with-archive-includes=${STAGING_INCDIR} --with-samba-includes=${STAGING_INCDIR}"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+