The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.

The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/

Upgrade instructions for port users:

Delete the old tracker package with:
# pkg delete -f tracker
And user port upgrade tool of choice to upgrade.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:		201980

9 files changed, 67 insertions, 855 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 7f4f0fb32676..86fea0384e3a 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,10 +1,9 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/gvfs/Makefile 19827 2014-08-24 08:15:41Z gusi $
 
 PORTNAME=	gvfs
-PORTVERSION=	1.20.3
-PORTREVISION=	4
+PORTVERSION=	1.24.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -21,13 +20,12 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libarchive libtool pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 gnomeprefix intlhack intltool libxslt:build
+USE_GNOME=	glib20 intlhack libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-obexftp \
-		--disable-bluray \
-		--disable-afc
+		--disable-bluray
 
 CONFIGURE_ARGS+=\
 		--disable-gudev \
@@ -37,7 +35,6 @@ CONFIGURE_ARGS+=\
 		--disable-udev \
 		--disable-goa \
 		--disable-keyring \
-		--disable-bluray \
 		--disable-libmtp \
 		--disable-gtk
 
@@ -46,11 +43,12 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
+OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC
 OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
 CDDA_DESC=	CDDA (enables HAL)
 GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL)
 SAMBA_DESC=	Samba support
+AFC_DESC=	Apple device support
 
 FUSE_USES=	fuse
 FUSE_CONFIGURE_ENABLE=	fuse
@@ -67,6 +65,10 @@ GPHOTO2_CONFIGURE_ENABLE=	gphoto2
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
+AFC_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \
+			libplist.so:${PORTSDIR}/devel/libplist
+AFC_CONFIGURE_ENABLE=	afc
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSAMBA}
@@ -92,6 +94,5 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
-	${TOUCH} ${STAGEDIR}${DATADIR}/remote-volume-monitors/.keep
 
 .include <bsd.port.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 7297317d5eae..c77e1297275c 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gvfs-1.20.3.tar.xz) = 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba
-SIZE (gnome3/gvfs-1.20.3.tar.xz) = 1558028
+SHA256 (gnome3/gvfs-1.24.1.tar.xz) = d38367ce189415c36fd19dca478bc9b80694b495c3458e74fb0f13d1ac9df1f9
+SIZE (gnome3/gvfs-1.24.1.tar.xz) = 1624212
diff --git a/devel/gvfs/files/common_Makefile.am b/devel/gvfs/files/common_Makefile.am
new file mode 100644
index 000000000000..5cd673a4c1dc
--- /dev/null
+++ b/devel/gvfs/files/common_Makefile.am
@@ -0,0 +1,18 @@
+--- common/Makefile.am.orig	2015-02-13 07:19:44 UTC
++++ common/Makefile.am
+@@ -43,6 +43,15 @@ libgvfscommon_la_LIBADD =	\
+ 	$(GLIB_LIBS)		\
+ 	$(BLURAY_LIBS)
+ 
++if USE_HAL
++libgvfscommon_la_SOURCES += 	\
++	gvfsdbusutils.c		gvfsdbusutils.h
++libgvfscommon_la_CFLAGS +=	\
++	$(DBUS_CFLAGS)
++libgvfscommon_la_LIBADD =	\
++	$(DBUS_LIBS)
++endif
++
+ libgvfscommon_monitor_la_SOURCES = 	\
+ 	gvfsmountinfo.h gvfsmountinfo.c \
+ 	$(NULL)
diff --git a/devel/gvfs/files/monitor_hal_Makefile.am b/devel/gvfs/files/monitor_hal_Makefile.am
new file mode 100644
index 000000000000..f6f626b4bc83
--- /dev/null
+++ b/devel/gvfs/files/monitor_hal_Makefile.am
@@ -0,0 +1,10 @@
+--- monitor/hal/Makefile.am.orig	2015-02-03 15:52:20 UTC
++++ monitor/hal/Makefile.am
+@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES =			\
+ 	ghalvolume.c		ghalvolume.h		\
+ 	ghalmount.c		ghalmount.h		\
+ 	ghalvolumemonitor.c	ghalvolumemonitor.h	\
+-	gvfsdbusutils.c		gvfsdbusutils.h		\
+ 	$(NULL)
+ 
+ gvfs_hal_volume_monitor_CFLAGS =		\
diff --git a/devel/gvfs/files/patch-common_Makefile.in b/devel/gvfs/files/patch-common_Makefile.in
deleted file mode 100644
index d702fb4a03a4..000000000000
--- a/devel/gvfs/files/patch-common_Makefile.in
+++ /dev/null
@@ -1,201 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=722411
-
---- common/Makefile.in.orig	2014-05-25 17:42:50.000000000 +0200
-+++ common/Makefile.in	2014-05-25 17:43:35.000000000 +0200
-@@ -78,7 +78,13 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_AVAHI_TRUE@am__append_1 = libgvfscommon-dnssd.la
-+@USE_HAL_TRUE@am__append_1 = \
-+@USE_HAL_TRUE@	gvfsdbusutils.c		gvfsdbusutils.h
-+
-+@USE_HAL_TRUE@am__append_2 = \
-+@USE_HAL_TRUE@	$(DBUS_CFLAGS)
-+
-+@HAVE_AVAHI_TRUE@am__append_3 = libgvfscommon-dnssd.la
- subdir = common
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/depcomp
-@@ -156,15 +162,26 @@
- 	$(LDFLAGS) -o $@
- libgvfscommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--am__objects_2 = gvfsdbus.lo
--am_libgvfscommon_la_OBJECTS = gmountspec.lo gmountoperationdbus.lo \
--	gmountsource.lo gmounttracker.lo gvfsdaemonprotocol.lo \
--	gvfsicon.lo gvfsfileinfo.lo $(am__objects_2) $(am__objects_1)
-+am__libgvfscommon_la_SOURCES_DIST = gmountspec.c gmountspec.h \
-+	gmountoperationdbus.c gmountoperationdbus.h gmountsource.c \
-+	gmountsource.h gmounttracker.c gmounttracker.h \
-+	gvfsdaemonprotocol.c gvfsdaemonprotocol.h gvfsicon.h \
-+	gvfsicon.c gvfsfileinfo.c gvfsfileinfo.h gvfsdbus.c gvfsdbus.h \
-+	gvfsdbusutils.c gvfsdbusutils.h
-+am__objects_2 = libgvfscommon_la-gvfsdbus.lo
-+@USE_HAL_TRUE@am__objects_3 = libgvfscommon_la-gvfsdbusutils.lo
-+am_libgvfscommon_la_OBJECTS = libgvfscommon_la-gmountspec.lo \
-+	libgvfscommon_la-gmountoperationdbus.lo \
-+	libgvfscommon_la-gmountsource.lo \
-+	libgvfscommon_la-gmounttracker.lo \
-+	libgvfscommon_la-gvfsdaemonprotocol.lo \
-+	libgvfscommon_la-gvfsicon.lo libgvfscommon_la-gvfsfileinfo.lo \
-+	$(am__objects_2) $(am__objects_1) $(am__objects_3)
- libgvfscommon_la_OBJECTS = $(am_libgvfscommon_la_OBJECTS)
- libgvfscommon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
--	$(AM_CFLAGS) $(CFLAGS) $(libgvfscommon_la_LDFLAGS) $(LDFLAGS) \
--	-o $@
-+	$(libgvfscommon_la_CFLAGS) $(CFLAGS) \
-+	$(libgvfscommon_la_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -204,7 +221,7 @@
- 	$(libgvfscommon_la_SOURCES)
- DIST_SOURCES = $(am__libgvfscommon_dnssd_la_SOURCES_DIST) \
- 	$(libgvfscommon_monitor_la_SOURCES) \
--	$(libgvfscommon_la_SOURCES)
-+	$(am__libgvfscommon_la_SOURCES_DIST)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -456,7 +473,7 @@
- top_srcdir = @top_srcdir@
- NULL = 
- pkglib_LTLIBRARIES = libgvfscommon.la
--noinst_LTLIBRARIES = libgvfscommon-monitor.la $(am__append_1)
-+noinst_LTLIBRARIES = libgvfscommon-monitor.la $(am__append_3)
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
- 	-I$(top_srcdir)/daemon \
- 	$(GLIB_CFLAGS) $(BLURAY_CFLAGS) \
-@@ -464,17 +481,12 @@
- 
- dbus_built_sources = gvfsdbus.c gvfsdbus.h
- BUILT_SOURCES = $(dbus_built_sources)
--libgvfscommon_la_SOURCES = \
--	gmountspec.c gmountspec.h \
--	gmountoperationdbus.c gmountoperationdbus.h \
--	gmountsource.c gmountsource.h \
--	gmounttracker.c gmounttracker.h \
--	gvfsdaemonprotocol.c gvfsdaemonprotocol.h \
--	gvfsicon.h gvfsicon.c \
--	gvfsfileinfo.c gvfsfileinfo.h \
--	$(dbus_built_sources) \
--	$(NULL)
--
-+libgvfscommon_la_SOURCES = gmountspec.c gmountspec.h \
-+	gmountoperationdbus.c gmountoperationdbus.h gmountsource.c \
-+	gmountsource.h gmounttracker.c gmounttracker.h \
-+	gvfsdaemonprotocol.c gvfsdaemonprotocol.h gvfsicon.h \
-+	gvfsicon.c gvfsfileinfo.c gvfsfileinfo.h $(dbus_built_sources) \
-+	$(NULL) $(am__append_1)
- 
- # needed by cygwin (see bug #564003)
- libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version
-@@ -482,6 +494,10 @@
- 	$(GLIB_LIBS)		\
- 	$(BLURAY_LIBS)
- 
-+@USE_HAL_TRUE@libgvfscommon_la_LIBADD = \
-+@USE_HAL_TRUE@	$(DBUS_LIBS)
-+
-+libgvfscommon_la_CFLAGS = $(am__append_2)
- libgvfscommon_monitor_la_SOURCES = \
- 	gvfsmountinfo.h gvfsmountinfo.c \
- 	$(NULL)
-@@ -607,16 +623,17 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountoperationdbus.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountsource.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountspec.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmounttracker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsdaemonprotocol.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsdbus.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsfileinfo.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsicon.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdresolver.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdutils.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountsource.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountspec.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmounttracker.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsicon.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_monitor_la-gvfsmountinfo.Plo@am__quote@
- 
- .c.o:
-@@ -661,6 +678,69 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_monitor_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_monitor_la-gvfsmountinfo.lo `test -f 'gvfsmountinfo.c' || echo '$(srcdir)/'`gvfsmountinfo.c
- 
-+libgvfscommon_la-gmountspec.lo: gmountspec.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountspec.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountspec.Tpo -c -o libgvfscommon_la-gmountspec.lo `test -f 'gmountspec.c' || echo '$(srcdir)/'`gmountspec.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountspec.Tpo $(DEPDIR)/libgvfscommon_la-gmountspec.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gmountspec.c' object='libgvfscommon_la-gmountspec.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountspec.lo `test -f 'gmountspec.c' || echo '$(srcdir)/'`gmountspec.c
-+
-+libgvfscommon_la-gmountoperationdbus.lo: gmountoperationdbus.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountoperationdbus.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Tpo -c -o libgvfscommon_la-gmountoperationdbus.lo `test -f 'gmountoperationdbus.c' || echo '$(srcdir)/'`gmountoperationdbus.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Tpo $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gmountoperationdbus.c' object='libgvfscommon_la-gmountoperationdbus.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountoperationdbus.lo `test -f 'gmountoperationdbus.c' || echo '$(srcdir)/'`gmountoperationdbus.c
-+
-+libgvfscommon_la-gmountsource.lo: gmountsource.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountsource.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountsource.Tpo -c -o libgvfscommon_la-gmountsource.lo `test -f 'gmountsource.c' || echo '$(srcdir)/'`gmountsource.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountsource.Tpo $(DEPDIR)/libgvfscommon_la-gmountsource.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gmountsource.c' object='libgvfscommon_la-gmountsource.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountsource.lo `test -f 'gmountsource.c' || echo '$(srcdir)/'`gmountsource.c
-+
-+libgvfscommon_la-gmounttracker.lo: gmounttracker.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmounttracker.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmounttracker.Tpo -c -o libgvfscommon_la-gmounttracker.lo `test -f 'gmounttracker.c' || echo '$(srcdir)/'`gmounttracker.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmounttracker.Tpo $(DEPDIR)/libgvfscommon_la-gmounttracker.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gmounttracker.c' object='libgvfscommon_la-gmounttracker.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmounttracker.lo `test -f 'gmounttracker.c' || echo '$(srcdir)/'`gmounttracker.c
-+
-+libgvfscommon_la-gvfsdaemonprotocol.lo: gvfsdaemonprotocol.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdaemonprotocol.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Tpo -c -o libgvfscommon_la-gvfsdaemonprotocol.lo `test -f 'gvfsdaemonprotocol.c' || echo '$(srcdir)/'`gvfsdaemonprotocol.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsdaemonprotocol.c' object='libgvfscommon_la-gvfsdaemonprotocol.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdaemonprotocol.lo `test -f 'gvfsdaemonprotocol.c' || echo '$(srcdir)/'`gvfsdaemonprotocol.c
-+
-+libgvfscommon_la-gvfsicon.lo: gvfsicon.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsicon.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsicon.Tpo -c -o libgvfscommon_la-gvfsicon.lo `test -f 'gvfsicon.c' || echo '$(srcdir)/'`gvfsicon.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsicon.Tpo $(DEPDIR)/libgvfscommon_la-gvfsicon.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsicon.c' object='libgvfscommon_la-gvfsicon.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsicon.lo `test -f 'gvfsicon.c' || echo '$(srcdir)/'`gvfsicon.c
-+
-+libgvfscommon_la-gvfsfileinfo.lo: gvfsfileinfo.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsfileinfo.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Tpo -c -o libgvfscommon_la-gvfsfileinfo.lo `test -f 'gvfsfileinfo.c' || echo '$(srcdir)/'`gvfsfileinfo.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Tpo $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsfileinfo.c' object='libgvfscommon_la-gvfsfileinfo.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsfileinfo.lo `test -f 'gvfsfileinfo.c' || echo '$(srcdir)/'`gvfsfileinfo.c
-+
-+libgvfscommon_la-gvfsdbus.lo: gvfsdbus.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdbus.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdbus.Tpo -c -o libgvfscommon_la-gvfsdbus.lo `test -f 'gvfsdbus.c' || echo '$(srcdir)/'`gvfsdbus.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbus.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsdbus.c' object='libgvfscommon_la-gvfsdbus.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdbus.lo `test -f 'gvfsdbus.c' || echo '$(srcdir)/'`gvfsdbus.c
-+
-+libgvfscommon_la-gvfsdbusutils.lo: gvfsdbusutils.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdbusutils.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Tpo -c -o libgvfscommon_la-gvfsdbusutils.lo `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsdbusutils.c' object='libgvfscommon_la-gvfsdbusutils.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdbusutils.lo `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
diff --git a/devel/gvfs/files/patch-common_gvfsdbusutils.c b/devel/gvfs/files/patch-common_gvfsdbusutils.c
deleted file mode 100644
index a79308b0d210..000000000000
--- a/devel/gvfs/files/patch-common_gvfsdbusutils.c
+++ /dev/null
@@ -1,543 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=722411
-
---- common/gvfsdbusutils.c.orig	2014-05-25 17:43:08.000000000 +0200
-+++ common/gvfsdbusutils.c	2014-05-25 17:43:08.000000000 +0200
-@@ -0,0 +1,538 @@
-+/* GIO - GLib Input, Output and Streaming Library
-+ * 
-+ * Copyright (C) 2006-2007 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Alexander Larsson <alexl@redhat.com>
-+ */
-+
-+#include <config.h>
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <glib/gi18n-lib.h>
-+#include <gvfsdbusutils.h>
-+#include <gio/gio.h>
-+
-+static void
-+_g_dbus_oom (void)
-+{
-+  g_error ("DBus failed with out of memory error");
-+}
-+
-+/*************************************************************************
-+ *             Helper fd source                                          *
-+ ************************************************************************/
-+
-+typedef struct 
-+{
-+  GSource source;
-+  GPollFD pollfd;
-+  GCancellable *cancellable;
-+  gulong cancelled_tag;
-+} FDSource;
-+
-+static gboolean 
-+fd_source_prepare (GSource  *source,
-+		   gint     *timeout)
-+{
-+  FDSource *fd_source = (FDSource *)source;
-+  *timeout = -1;
-+  
-+  return g_cancellable_is_cancelled (fd_source->cancellable);
-+}
-+
-+static gboolean 
-+fd_source_check (GSource  *source)
-+{
-+  FDSource *fd_source = (FDSource *)source;
-+
-+  return
-+    g_cancellable_is_cancelled  (fd_source->cancellable) ||
-+    fd_source->pollfd.revents != 0;
-+}
-+
-+static gboolean
-+fd_source_dispatch (GSource     *source,
-+		    GSourceFunc  callback,
-+		    gpointer     user_data)
-+
-+{
-+  GFDSourceFunc func = (GFDSourceFunc)callback;
-+  FDSource *fd_source = (FDSource *)source;
-+
-+  g_assert (func != NULL);
-+
-+  return (*func) (user_data, fd_source->pollfd.revents, fd_source->pollfd.fd);
-+}
-+
-+static void 
-+fd_source_finalize (GSource *source)
-+{
-+  FDSource *fd_source = (FDSource *)source;
-+
-+  if (fd_source->cancelled_tag)
-+    g_cancellable_disconnect (fd_source->cancellable,
-+			      fd_source->cancelled_tag);
-+
-+  if (fd_source->cancellable)
-+    g_object_unref (fd_source->cancellable);
-+}
-+
-+static GSourceFuncs fd_source_funcs = {
-+  fd_source_prepare,
-+  fd_source_check,
-+  fd_source_dispatch,
-+  fd_source_finalize
-+};
-+
-+/* Might be called on another thread */
-+static void
-+fd_source_cancelled_cb (GCancellable *cancellable,
-+			gpointer data)
-+{
-+  /* Wake up the mainloop in case we're waiting on async calls with FDSource */
-+  g_main_context_wakeup (NULL);
-+}
-+
-+/* Two __ to avoid conflict with gio version */
-+GSource *
-+__g_fd_source_new (int fd,
-+		   gushort events,
-+		   GCancellable *cancellable)
-+{
-+  GSource *source;
-+  FDSource *fd_source;
-+
-+  source = g_source_new (&fd_source_funcs, sizeof (FDSource));
-+  fd_source = (FDSource *)source;
-+
-+  if (cancellable)
-+    fd_source->cancellable = g_object_ref (cancellable);
-+  
-+  fd_source->pollfd.fd = fd;
-+  fd_source->pollfd.events = events;
-+  g_source_add_poll (source, &fd_source->pollfd);
-+
-+  if (cancellable)
-+    fd_source->cancelled_tag =
-+      g_cancellable_connect (cancellable,
-+			     (GCallback)fd_source_cancelled_cb,
-+			     NULL, NULL);
-+  
-+  return source;
-+}
-+
-+/*************************************************************************
-+ *                                                                       *
-+ *      dbus mainloop integration for async ops                          *
-+ *                                                                       *
-+ *************************************************************************/
-+
-+static gint32 main_integration_data_slot = -1;
-+static GOnce once_init_main_integration = G_ONCE_INIT;
-+
-+/**
-+ * A GSource subclass for dispatching DBusConnection messages.
-+ * We need this on top of the IO handlers, because sometimes
-+ * there are messages to dispatch queued up but no IO pending.
-+ * 
-+ * The source is owned by the connection (and the main context
-+ * while that is alive)
-+ */
-+typedef struct 
-+{
-+  GSource source;
-+  
-+  DBusConnection *connection;
-+  GSList *ios;
-+  GSList *timeouts;
-+} DBusSource;
-+
-+typedef struct
-+{
-+  DBusSource *dbus_source;
-+  GSource *source;
-+  DBusWatch *watch;
-+} IOHandler;
-+
-+typedef struct
-+{
-+  DBusSource *dbus_source;
-+  GSource *source;
-+  DBusTimeout *timeout;
-+} TimeoutHandler;
-+
-+static gpointer
-+main_integration_init (gpointer arg)
-+{
-+  if (!dbus_connection_allocate_data_slot (&main_integration_data_slot))
-+    g_error ("Unable to allocate data slot");
-+
-+  return NULL;
-+}
-+
-+static gboolean
-+dbus_source_prepare (GSource *source,
-+		     gint    *timeout)
-+{
-+  DBusConnection *connection = ((DBusSource *)source)->connection;
-+  
-+  *timeout = -1;
-+
-+  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);  
-+}
-+
-+static gboolean
-+dbus_source_check (GSource *source)
-+{
-+  return FALSE;
-+}
-+
-+static gboolean
-+dbus_source_dispatch (GSource     *source,
-+		      GSourceFunc  callback,
-+		      gpointer     user_data)
-+{
-+  DBusConnection *connection = ((DBusSource *)source)->connection;
-+
-+  dbus_connection_ref (connection);
-+
-+  /* Only dispatch once - we don't want to starve other GSource */
-+  dbus_connection_dispatch (connection);
-+  
-+  dbus_connection_unref (connection);
-+
-+  return TRUE;
-+}
-+
-+static gboolean
-+io_handler_dispatch (gpointer data,
-+                     GIOCondition condition,
-+                     int fd)
-+{
-+  IOHandler *handler = data;
-+  guint dbus_condition = 0;
-+  DBusConnection *connection;
-+
-+  connection = handler->dbus_source->connection;
-+  
-+  if (connection)
-+    dbus_connection_ref (connection);
-+  
-+  if (condition & G_IO_IN)
-+    dbus_condition |= DBUS_WATCH_READABLE;
-+  if (condition & G_IO_OUT)
-+    dbus_condition |= DBUS_WATCH_WRITABLE;
-+  if (condition & G_IO_ERR)
-+    dbus_condition |= DBUS_WATCH_ERROR;
-+  if (condition & G_IO_HUP)
-+    dbus_condition |= DBUS_WATCH_HANGUP;
-+
-+  /* Note that we don't touch the handler after this, because
-+   * dbus may have disabled the watch and thus killed the
-+   * handler.
-+   */
-+  dbus_watch_handle (handler->watch, dbus_condition);
-+  handler = NULL;
-+
-+  if (connection)
-+    dbus_connection_unref (connection);
-+  
-+  return TRUE;
-+}
-+
-+static void
-+io_handler_free (IOHandler *handler)
-+{
-+  DBusSource *dbus_source;
-+  
-+  dbus_source = handler->dbus_source;
-+  dbus_source->ios = g_slist_remove (dbus_source->ios, handler);
-+  
-+  g_source_destroy (handler->source);
-+  g_source_unref (handler->source);
-+  g_free (handler);
-+}
-+
-+static void
-+dbus_source_add_watch (DBusSource *dbus_source,
-+		       DBusWatch *watch)
-+{
-+  guint flags;
-+  GIOCondition condition;
-+  IOHandler *handler;
-+  int fd;
-+
-+  if (!dbus_watch_get_enabled (watch))
-+    return;
-+  
-+  g_assert (dbus_watch_get_data (watch) == NULL);
-+  
-+  flags = dbus_watch_get_flags (watch);
-+
-+  condition = G_IO_ERR | G_IO_HUP;
-+  if (flags & DBUS_WATCH_READABLE)
-+    condition |= G_IO_IN;
-+  if (flags & DBUS_WATCH_WRITABLE)
-+    condition |= G_IO_OUT;
-+
-+  handler = g_new0 (IOHandler, 1);
-+  handler->dbus_source = dbus_source;
-+  handler->watch = watch;
-+
-+#if (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION == 1 && DBUS_MICRO_VERSION >= 1) || (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION > 1) || (DBUS_MAJOR_VERSION > 1)
-+  fd = dbus_watch_get_unix_fd (watch);
-+#else
-+  fd = dbus_watch_get_fd (watch);
-+#endif
-+    
-+  handler->source = __g_fd_source_new (fd, condition, NULL);
-+  g_source_set_callback (handler->source,
-+			 (GSourceFunc) io_handler_dispatch, handler,
-+                         NULL);
-+  g_source_attach (handler->source, NULL);
-+ 
-+  dbus_source->ios = g_slist_prepend (dbus_source->ios, handler);
-+  dbus_watch_set_data (watch, handler,
-+		       (DBusFreeFunction)io_handler_free);
-+}
-+
-+static void
-+dbus_source_remove_watch (DBusSource *dbus_source,
-+			  DBusWatch *watch)
-+{
-+  dbus_watch_set_data (watch, NULL, NULL);
-+}
-+
-+static void
-+timeout_handler_free (TimeoutHandler *handler)
-+{
-+  DBusSource *dbus_source;
-+
-+  dbus_source = handler->dbus_source;
-+  dbus_source->timeouts = g_slist_remove (dbus_source->timeouts, handler);
-+
-+  g_source_destroy (handler->source);
-+  g_source_unref (handler->source);
-+  g_free (handler);
-+}
-+
-+static gboolean
-+timeout_handler_dispatch (gpointer      data)
-+{
-+  TimeoutHandler *handler = data;
-+
-+  dbus_timeout_handle (handler->timeout);
-+  
-+  return TRUE;
-+}
-+
-+static void
-+dbus_source_add_timeout (DBusSource *dbus_source,
-+			 DBusTimeout *timeout)
-+{
-+  TimeoutHandler *handler;
-+  
-+  if (!dbus_timeout_get_enabled (timeout))
-+    return;
-+  
-+  g_assert (dbus_timeout_get_data (timeout) == NULL);
-+
-+  handler = g_new0 (TimeoutHandler, 1);
-+  handler->dbus_source = dbus_source;
-+  handler->timeout = timeout;
-+
-+  handler->source = g_timeout_source_new (dbus_timeout_get_interval (timeout));
-+  g_source_set_callback (handler->source,
-+			 timeout_handler_dispatch, handler,
-+                         NULL);
-+  g_source_attach (handler->source, NULL);
-+
-+  /* handler->source is owned by the context here */
-+  dbus_source->timeouts = g_slist_prepend (dbus_source->timeouts, handler);
-+
-+  dbus_timeout_set_data (timeout, handler,
-+			 (DBusFreeFunction)timeout_handler_free);
-+}
-+
-+static void
-+dbus_source_remove_timeout (DBusSource *source,
-+			    DBusTimeout *timeout)
-+{
-+  dbus_timeout_set_data (timeout, NULL, NULL);
-+}
-+
-+static dbus_bool_t
-+add_watch (DBusWatch *watch,
-+	   gpointer   data)
-+{
-+  DBusSource *dbus_source = data;
-+
-+  dbus_source_add_watch (dbus_source, watch);
-+  
-+  return TRUE;
-+}
-+
-+static void
-+remove_watch (DBusWatch *watch,
-+	      gpointer   data)
-+{
-+  DBusSource *dbus_source = data;
-+
-+  dbus_source_remove_watch (dbus_source, watch);
-+}
-+
-+static void
-+watch_toggled (DBusWatch *watch,
-+               void      *data)
-+{
-+  /* Because we just exit on OOM, enable/disable is
-+   * no different from add/remove */
-+  if (dbus_watch_get_enabled (watch))
-+    add_watch (watch, data);
-+  else
-+    remove_watch (watch, data);
-+}
-+
-+static dbus_bool_t
-+add_timeout (DBusTimeout *timeout,
-+	     void        *data)
-+{
-+  DBusSource *source = data;
-+  
-+  if (!dbus_timeout_get_enabled (timeout))
-+    return TRUE;
-+
-+  dbus_source_add_timeout (source, timeout);
-+
-+  return TRUE;
-+}
-+
-+static void
-+remove_timeout (DBusTimeout *timeout,
-+		void        *data)
-+{
-+  DBusSource *source = data;
-+
-+  dbus_source_remove_timeout (source, timeout);
-+}
-+
-+static void
-+timeout_toggled (DBusTimeout *timeout,
-+                 void        *data)
-+{
-+  /* Because we just exit on OOM, enable/disable is
-+   * no different from add/remove
-+   */
-+  if (dbus_timeout_get_enabled (timeout))
-+    add_timeout (timeout, data);
-+  else
-+    remove_timeout (timeout, data);
-+}
-+
-+static void
-+wakeup_main (void *data)
-+{
-+  g_main_context_wakeup (NULL);
-+}
-+
-+static const GSourceFuncs dbus_source_funcs = {
-+  dbus_source_prepare,
-+  dbus_source_check,
-+  dbus_source_dispatch
-+};
-+
-+/* Called when the connection dies or when we're unintegrating from mainloop */
-+static void
-+dbus_source_free (DBusSource *dbus_source)
-+{
-+  while (dbus_source->ios)
-+    {
-+      IOHandler *handler = dbus_source->ios->data;
-+      
-+      dbus_watch_set_data (handler->watch, NULL, NULL);
-+    }
-+
-+  while (dbus_source->timeouts)
-+    {
-+      TimeoutHandler *handler = dbus_source->timeouts->data;
-+      
-+      dbus_timeout_set_data (handler->timeout, NULL, NULL);
-+    }
-+
-+  /* Remove from mainloop */
-+  g_source_destroy ((GSource *)dbus_source);
-+
-+  g_source_unref ((GSource *)dbus_source);
-+}
-+
-+void
-+_g_dbus_connection_integrate_with_main  (DBusConnection *connection)
-+{
-+  DBusSource *dbus_source;
-+
-+  g_once (&once_init_main_integration, main_integration_init, NULL);
-+  
-+  g_assert (connection != NULL);
-+
-+  _g_dbus_connection_remove_from_main (connection);
-+
-+  dbus_source = (DBusSource *)
-+    g_source_new ((GSourceFuncs*)&dbus_source_funcs,
-+		  sizeof (DBusSource));
-+  
-+  dbus_source->connection = connection;
-+  
-+  if (!dbus_connection_set_watch_functions (connection,
-+                                            add_watch,
-+                                            remove_watch,
-+                                            watch_toggled,
-+                                            dbus_source, NULL))
-+    _g_dbus_oom ();
-+
-+  if (!dbus_connection_set_timeout_functions (connection,
-+                                              add_timeout,
-+                                              remove_timeout,
-+                                              timeout_toggled,
-+                                              dbus_source, NULL))
-+    _g_dbus_oom ();
-+    
-+  dbus_connection_set_wakeup_main_function (connection,
-+					    wakeup_main,
-+					    dbus_source, NULL);
-+
-+  /* Owned by both connection and mainloop (until destroy) */
-+  g_source_attach ((GSource *)dbus_source, NULL);
-+
-+  if (!dbus_connection_set_data (connection,
-+				 main_integration_data_slot,
-+				 dbus_source, (DBusFreeFunction)dbus_source_free))
-+    _g_dbus_oom ();
-+}
-+
-+void
-+_g_dbus_connection_remove_from_main (DBusConnection *connection)
-+{
-+  g_once (&once_init_main_integration, main_integration_init, NULL);
-+
-+  if (!dbus_connection_set_data (connection,
-+				 main_integration_data_slot,
-+				 NULL, NULL))
-+    _g_dbus_oom ();
-+}
diff --git a/devel/gvfs/files/patch-common_gvfsdbusutils.h b/devel/gvfs/files/patch-common_gvfsdbusutils.h
deleted file mode 100644
index 875002011374..000000000000
--- a/devel/gvfs/files/patch-common_gvfsdbusutils.h
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=722411
-
---- common/gvfsdbusutils.h.orig	2014-05-25 17:43:08.000000000 +0200
-+++ common/gvfsdbusutils.h	2014-05-25 17:43:08.000000000 +0200
-@@ -0,0 +1,42 @@
-+/* GIO - GLib Input, Output and Streaming Library
-+ * 
-+ * Copyright (C) 2006-2007 Red Hat, Inc.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General
-+ * Public License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Alexander Larsson <alexl@redhat.com>
-+ */
-+
-+#ifndef __GVFS_DBUS_UTILS_H__
-+#define __GVFS_DBUS_UTILS_H__
-+
-+#include <glib.h>
-+#include <dbus/dbus.h>
-+#include <gio/gio.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef gboolean (*GFDSourceFunc) (gpointer data,
-+				   GIOCondition condition,
-+				   int fd);
-+
-+void         _g_dbus_connection_integrate_with_main (DBusConnection   *connection);
-+void         _g_dbus_connection_remove_from_main    (DBusConnection   *connection);
-+
-+G_END_DECLS
-+
-+
-+#endif /* __GVFS_DBUS_UTILS_H__ */
diff --git a/devel/gvfs/files/patch-monitor_hal_Makefile.in b/devel/gvfs/files/patch-monitor_hal_Makefile.in
deleted file mode 100644
index 2d1d2dfb7de5..000000000000
--- a/devel/gvfs/files/patch-monitor_hal_Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=722411
-
---- monitor/hal/Makefile.in.orig	2014-05-25 17:43:00.000000000 +0200
-+++ monitor/hal/Makefile.in	2014-05-25 17:43:37.000000000 +0200
-@@ -110,7 +110,6 @@
- 	gvfs_hal_volume_monitor-ghalvolume.$(OBJEXT) \
- 	gvfs_hal_volume_monitor-ghalmount.$(OBJEXT) \
- 	gvfs_hal_volume_monitor-ghalvolumemonitor.$(OBJEXT) \
--	gvfs_hal_volume_monitor-gvfsdbusutils.$(OBJEXT) \
- 	$(am__objects_1)
- gvfs_hal_volume_monitor_OBJECTS =  \
- 	$(am_gvfs_hal_volume_monitor_OBJECTS)
-@@ -456,7 +455,6 @@
- 	ghalvolume.c		ghalvolume.h		\
- 	ghalmount.c		ghalmount.h		\
- 	ghalvolumemonitor.c	ghalvolumemonitor.h	\
--	gvfsdbusutils.c		gvfsdbusutils.h		\
- 	$(NULL)
- 
- gvfs_hal_volume_monitor_CFLAGS = \
-@@ -587,7 +585,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalmount.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalvolume.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalvolumemonitor.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-device.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-marshal.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-pool.Po@am__quote@
-@@ -741,20 +738,6 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-ghalvolumemonitor.obj `if test -f 'ghalvolumemonitor.c'; then $(CYGPATH_W) 'ghalvolumemonitor.c'; else $(CYGPATH_W) '$(srcdir)/ghalvolumemonitor.c'; fi`
- 
--gvfs_hal_volume_monitor-gvfsdbusutils.o: gvfsdbusutils.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -MT gvfs_hal_volume_monitor-gvfsdbusutils.o -MD -MP -MF $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo -c -o gvfs_hal_volume_monitor-gvfsdbusutils.o `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsdbusutils.c' object='gvfs_hal_volume_monitor-gvfsdbusutils.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-gvfsdbusutils.o `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c
--
--gvfs_hal_volume_monitor-gvfsdbusutils.obj: gvfsdbusutils.c
--@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -MT gvfs_hal_volume_monitor-gvfsdbusutils.obj -MD -MP -MF $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo -c -o gvfs_hal_volume_monitor-gvfsdbusutils.obj `if test -f 'gvfsdbusutils.c'; then $(CYGPATH_W) 'gvfsdbusutils.c'; else $(CYGPATH_W) '$(srcdir)/gvfsdbusutils.c'; fi`
--@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gvfsdbusutils.c' object='gvfs_hal_volume_monitor-gvfsdbusutils.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-gvfsdbusutils.obj `if test -f 'gvfsdbusutils.c'; then $(CYGPATH_W) 'gvfsdbusutils.c'; else $(CYGPATH_W) '$(srcdir)/gvfsdbusutils.c'; fi`
--
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 2f9a88784eea..3cce3d845303 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -22,10 +22,12 @@ lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.so
 lib/gvfs/libgvfscommon.so
 lib/gvfs/libgvfsdaemon.so
-libexec/gvfsd-afp
-libexec/gvfsd-afp-browse
+%%AFC%%libexec/gvfs-afc-volume-monitor
 %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
 %%HAL%%libexec/gvfs-hal-volume-monitor
+libexec/gvfsd-afp
+libexec/gvfsd-afp-browse
+%%AFC%%libexec/gvfsd-afc
 libexec/gvfsd
 libexec/gvfsd-archive
 libexec/gvfsd-burn
@@ -47,6 +49,7 @@ libexec/gvfsd-trash
 man/man1/gvfs-cat.1.gz
 man/man1/gvfs-copy.1.gz
 man/man1/gvfs-info.1.gz
+man/man1/gvfs-less.1.gz
 man/man1/gvfs-ls.1.gz
 man/man1/gvfs-mime.1.gz
 man/man1/gvfs-mkdir.1.gz
@@ -67,11 +70,28 @@ man/man1/gvfsd.1.gz
 man/man7/gvfs.7.gz
 %%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
 %%SAMBA%%share/GConf/gsettings/gvfs-smb.convert
-share/bash-completion/completions/gvfs
+share/bash-completion/completions/gvfs-cat
+share/bash-completion/completions/gvfs-copy
+share/bash-completion/completions/gvfs-info
+share/bash-completion/completions/gvfs-less
+share/bash-completion/completions/gvfs-ls
+share/bash-completion/completions/gvfs-mkdir
+share/bash-completion/completions/gvfs-monitor-dir
+share/bash-completion/completions/gvfs-monitor-file
+share/bash-completion/completions/gvfs-move
+share/bash-completion/completions/gvfs-open
+share/bash-completion/completions/gvfs-rename
+share/bash-completion/completions/gvfs-rm
+share/bash-completion/completions/gvfs-save
+share/bash-completion/completions/gvfs-set-attribute
+share/bash-completion/completions/gvfs-trash
+share/bash-completion/completions/gvfs-tree
 share/dbus-1/services/gvfs-daemon.service
 share/dbus-1/services/gvfs-metadata.service
+%%AFC%%share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
 %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+%%AFC%%%%DATADIR%%/mounts/afc.mount
 share/gvfs/mounts/afp-browse.mount
 share/gvfs/mounts/afp.mount
 %%DATADIR%%/mounts/archive.mount
@@ -90,7 +110,7 @@ share/gvfs/mounts/afp.mount
 %%SAMBA%%%%DATADIR%%/mounts/smb-browse.mount
 %%SAMBA%%%%DATADIR%%/mounts/smb.mount
 %%DATADIR%%/mounts/trash.mount
-%%DATADIR%%/remote-volume-monitors/.keep
+%%AFC%%%%DATADIR%%/remote-volume-monitors/afc.monitor
 %%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
 %%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor
 share/locale/af/LC_MESSAGES/gvfs.mo
@@ -102,6 +122,7 @@ share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn/LC_MESSAGES/gvfs.mo
 share/locale/bn_IN/LC_MESSAGES/gvfs.mo
+share/locale/bs/LC_MESSAGES/gvfs.mo
 share/locale/ca/LC_MESSAGES/gvfs.mo
 share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
 share/locale/cs/LC_MESSAGES/gvfs.mo
@@ -164,3 +185,5 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+@dir %%DATADIR%%/remote-volume-monitors
+@dir share/GConf/gsettings