aboutsummaryrefslogtreecommitdiff
path: root/devel/gvfs
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gvfs')
-rw-r--r--devel/gvfs/Makefile82
-rw-r--r--devel/gvfs/distinfo4
-rw-r--r--devel/gvfs/files/patch-Makefile.in10
-rw-r--r--devel/gvfs/files/patch-common_Makefile.in201
-rw-r--r--devel/gvfs/files/patch-common_gvfsdbusutils.c543
-rw-r--r--devel/gvfs/files/patch-common_gvfsdbusutils.h47
-rw-r--r--devel/gvfs/files/patch-config.h.in12
-rw-r--r--devel/gvfs/files/patch-configure103
-rw-r--r--devel/gvfs/files/patch-daemon_gvfsbackendcdda.c94
-rw-r--r--devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c44
-rw-r--r--devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c14
-rw-r--r--devel/gvfs/files/patch-monitor_hal_Makefile.in49
-rw-r--r--devel/gvfs/pkg-plist48
13 files changed, 915 insertions, 336 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index b67d319d6346..bdbd86fdf528 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,10 +1,9 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $
+# $MCom: ports/trunk/devel/gvfs/Makefile 19827 2014-08-24 08:15:41Z gusi $
PORTNAME= gvfs
-PORTVERSION= 1.12.3
-PORTREVISION= 5
+PORTVERSION= 1.20.3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -12,6 +11,7 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME virtual file system
+BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
libgcrypt.so:${PORTSDIR}/security/libgcrypt \
@@ -19,67 +19,65 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
-USE_GNOME= glib20 gnomeprefix intlhack intltool
-USE_LDCONFIG= yes
+USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= glib20 gnomeprefix intlhack intltool libxslt:build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-obexftp \
--disable-bluray \
--disable-afc
+
+CONFIGURE_ARGS+=\
+ --disable-gudev \
+ --disable-libsystemd-login \
+ --disable-udisks2 \
+ --disable-gdu \
+ --disable-udev \
+ --disable-goa \
+ --disable-keyring \
+ --disable-bluray \
+ --disable-libmtp \
+ --disable-gtk
+
INSTALL_TARGET= install-strip
+GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml
+
+OPTIONS_SUB= yes
OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
-OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
+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
-GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml
+FUSE_USES= fuse
+FUSE_CONFIGURE_ENABLE= fuse
+
+SAMBA_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_CONFIGURE_ENABLE= samba
+
+CDDA_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_CONFIGURE_ENABLE= cdda
+
+GPHOTO2_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_CONFIGURE_ENABLE= gphoto2
+
+AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE= avahi
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MFUSE}
-USES+= fuse
-PLIST_SUB+= FUSE=""
-.else
-CONFIGURE_ARGS+= --disable-fuse
-PLIST_SUB+= FUSE="@comment "
+.if ${OSVERSION} < 1000000
+LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml
-PLIST_SUB+= SMB=""
-.else
-CONFIGURE_ARGS+= --disable-samba
-PLIST_SUB+= SMB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
-PLIST_SUB+= CDDA=""
-.else
-CONFIGURE_ARGS+= --disable-cdda
-PLIST_SUB+= CDDA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGPHOTO2}
-LIB_DEPENDS+= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-PLIST_SUB+= GPHOTO2=""
-.else
-CONFIGURE_ARGS+= --disable-gphoto2
-PLIST_SUB+= GPHOTO2="@comment "
.endif
.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app
GLIB_SCHEMAS+= org.gnome.system.dns_sd.gschema.xml
-PLIST_SUB+= AVAHI=""
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+= AVAHI="@comment "
.endif
.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
@@ -91,6 +89,10 @@ CONFIGURE_ARGS+=--disable-hal
PLIST_SUB+= HAL="@comment "
.endif
+# https://bugzilla.gnome.org/show_bug.cgi?id=722411
+post-patch:
+ @${RM} ${WRKSRC}/monitor/hal/gvfsdbusutils.[ch]
+
post-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
${TOUCH} ${STAGEDIR}${DATADIR}/remote-volume-monitors/.keep
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index b58710e7609a..7297317d5eae 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2
-SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968
+SHA256 (gnome3/gvfs-1.20.3.tar.xz) = 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba
+SIZE (gnome3/gvfs-1.20.3.tar.xz) = 1558028
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
deleted file mode 100644
index 658cccd6ad11..000000000000
--- a/devel/gvfs/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400
-+++ Makefile.in 2008-07-22 23:18:24.000000000 -0400
-@@ -269,7 +269,6 @@ SUBDIRS = \
- gconf \
- po \
- programs \
-- test \
- $(NULL)
-
- EXTRA_DIST = \
diff --git a/devel/gvfs/files/patch-common_Makefile.in b/devel/gvfs/files/patch-common_Makefile.in
new file mode 100644
index 000000000000..d702fb4a03a4
--- /dev/null
+++ b/devel/gvfs/files/patch-common_Makefile.in
@@ -0,0 +1,201 @@
+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
new file mode 100644
index 000000000000..a79308b0d210
--- /dev/null
+++ b/devel/gvfs/files/patch-common_gvfsdbusutils.c
@@ -0,0 +1,543 @@
+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
new file mode 100644
index 000000000000..875002011374
--- /dev/null
+++ b/devel/gvfs/files/patch-common_gvfsdbusutils.h
@@ -0,0 +1,47 @@
+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-config.h.in b/devel/gvfs/files/patch-config.h.in
deleted file mode 100644
index aca6bcf45a75..000000000000
--- a/devel/gvfs/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2012-05-15 20:07:21.000000000 +0200
-+++ config.h.in 2014-01-17 19:49:23.000000000 +0100
-@@ -51,6 +51,9 @@
- /* Define to 1 if gphoto2 is available */
- #undef HAVE_GPHOTO2
-
-+/* define to 1 if gphoto2.5 is available */
-+#undef HAVE_GPHOTO25
-+
- /* Define to 1 if you have the `grantpt' function. */
- #undef HAVE_GRANTPT
-
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
deleted file mode 100644
index efc346b66ed4..000000000000
--- a/devel/gvfs/files/patch-configure
+++ /dev/null
@@ -1,103 +0,0 @@
---- configure.orig 2014-01-17 19:42:49.000000000 +0100
-+++ configure 2014-01-17 19:43:03.000000000 +0100
-@@ -17233,6 +17233,100 @@
-
- $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h
-
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPHOTO2" >&5
-+$as_echo_n "checking for GPHOTO2... " >&6; }
-+
-+if test -n "$GPHOTO2_CFLAGS"; then
-+ pkg_cv_GPHOTO2_CFLAGS="$GPHOTO2_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.5.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$GPHOTO2_LIBS"; then
-+ pkg_cv_GPHOTO2_LIBS="$GPHOTO2_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_GPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.5.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1`
-+ else
-+ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GPHOTO2_PKG_ERRORS" >&5
-+
-+ as_fn_error $? "Package requirements (libgphoto2 >= 2.5.0) were not met:
-+
-+$GPHOTO2_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables GPHOTO2_CFLAGS
-+and GPHOTO2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables GPHOTO2_CFLAGS
-+and GPHOTO2_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+ GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS
-+ GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_GPHOTO25 1" >>confdefs.h
-+
-+
-+fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&5
- $as_echo "$as_me: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&2;}
diff --git a/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c b/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c
deleted file mode 100644
index 2c12869ae401..000000000000
--- a/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- daemon/gvfsbackendcdda.c.orig 2012-05-15 18:01:50 +0000
-+++ daemon/gvfsbackendcdda.c
-@@ -55,7 +55,12 @@
- #include "gvfsjobenumerate.h"
-
- #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
--#include <cdio/paranoia.h>
-+#define HAVE_PARANOIA_NEW_INCLUDES
-+#ifdef HAVE_PARANOIA_NEW_INCLUDES
-+ #include <cdio/paranoia/paranoia.h>
-+#else
-+ #include <cdio/paranoia.h>
-+#endif
- #include <cdio/cdio.h>
-
- /* TODO:
-@@ -158,6 +163,16 @@ release_metadata (GVfsBackendCdda *cdda_
- cdda_backend->tracks = NULL;
- }
-
-+static char *
-+cdtext_string_to_utf8 (const char *string)
-+{
-+ if (string == NULL)
-+ return NULL;
-+
-+ /* CD-text doesn't specify encoding. In case outside ascii, assume latin-1. */
-+ return g_convert (string, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
-+}
-+
- static void
- fetch_metadata (GVfsBackendCdda *cdda_backend)
- {
-@@ -169,11 +184,22 @@ fetch_metadata (GVfsBackendCdda *cdda_ba
- if (!cdio)
- return;
-
-- cdtext = cdio_get_cdtext(cdio, 0);
-+#if LIBCDIO_VERSION_NUM >= 84
-+ cdtext = cdio_get_cdtext (cdio);
-+#else
-+ cdtext = cdio_get_cdtext (cdio, 0);
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
-+
- if (cdtext) {
-- cdda_backend->album_title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
-- cdda_backend->album_artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
-- cdda_backend->genre = g_strdup (cdtext_get (CDTEXT_GENRE, cdtext));
-+#if LIBCDIO_VERSION_NUM >= 84
-+ cdda_backend->album_title = cdtext_string_to_utf8 (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, 0));
-+ cdda_backend->album_artist = cdtext_string_to_utf8 (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, 0));
-+ cdda_backend->genre = cdtext_string_to_utf8 (cdtext_get_const (cdtext, CDTEXT_FIELD_GENRE, 0));
-+#else
-+ cdda_backend->album_title = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_TITLE, cdtext));
-+ cdda_backend->album_artist = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_PERFORMER, cdtext));
-+ cdda_backend->genre = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_GENRE, cdtext));
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
- }
-
- cdtrack = cdio_get_first_track_num(cdio);
-@@ -182,10 +208,17 @@ fetch_metadata (GVfsBackendCdda *cdda_ba
- for ( ; cdtrack < last_cdtrack; cdtrack++ ) {
- GVfsBackendCddaTrack *track;
- track = g_new0 (GVfsBackendCddaTrack, 1);
-- cdtext = cdio_get_cdtext(cdio, cdtrack);
-+#if LIBCDIO_VERSION_NUM < 84
-+ cdtext = cdio_get_cdtext (cdio, cdtrack);
-+#endif /* LIBCDIO_VERSION_NUM < 84 */
- if (cdtext) {
-- track->title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
-- track->artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
-+#if LIBCDIO_VERSION_NUM >= 84
-+ track->title = cdtext_string_to_utf8 (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, cdtrack));
-+ track->artist = cdtext_string_to_utf8 (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack));
-+#else
-+ track->title = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_TITLE, cdtext));
-+ track->artist = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_PERFORMER, cdtext));
-+#endif /* LIBCDIO_VERSION_NUM >= 84 */
- }
- track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC;
-
-@@ -961,8 +994,10 @@ do_query_info (GVfsBackend *backend,
- g_file_info_set_display_name (info, _("Audio Disc")); /* TODO: fill in from metadata */
- g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
- g_file_info_set_content_type (info, "inode/directory");
-- SET_INFO ("xattr::org.gnome.audio.title", cdda_backend->album_title);
-- SET_INFO ("xattr::org.gnome.audio.artist", cdda_backend->album_artist);
-+ if (cdda_backend->album_title)
-+ SET_INFO ("xattr::org.gnome.audio.title", cdda_backend->album_title);
-+ if (cdda_backend->album_artist)
-+ SET_INFO ("xattr::org.gnome.audio.artist", cdda_backend->album_artist);
- SET_INFO ("xattr::org.gnome.audio.genre", cdda_backend->genre);
- g_file_info_set_size (info, 0);
- icon = g_themed_icon_new ("folder");
diff --git a/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c b/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
deleted file mode 100644
index d2a369967729..000000000000
--- a/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- daemon/gvfsbackendgphoto2.c.orig 2012-05-16 02:01:50.000000000 +0800
-+++ daemon/gvfsbackendgphoto2.c 2014-01-18 01:43:32.000000000 +0800
-@@ -1647,7 +1647,9 @@
- return;
- }
-
-+#ifndef HAVE_GPHOTO25
- DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename);
-+#endif
-
- /* set port */
- rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
-@@ -2590,7 +2592,11 @@
- }
- }
-
-+#ifdef HAVE_GPHOTO25
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
-+#else
- rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context);
-+#endif
- if (rc != 0)
- goto out;
-
-@@ -3222,14 +3228,18 @@
- if (rc != 0)
- goto out;
-
-- gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
- gp_file_set_name (file, write_handle->name);
- gp_file_set_mtime (file, time (NULL));
- gp_file_set_data_and_size (file,
- dup_for_gphoto2 (write_handle->data, write_handle->size),
- write_handle->size);
-
-+#ifdef HAVE_GPHOTO25
-+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context);
-+#else
-+ gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
- rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context);
-+#endif
- if (rc != 0)
- {
- gp_file_unref (file);
diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
deleted file mode 100644
index 6686b28aebb7..000000000000
--- a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400
-+++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400
-@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor *
- return NULL;
-
- /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
-+#ifdef __FreeBSD__
-+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
-+#else
- device_path = hal_device_get_property_string (drive_device, "linux.device_file");
-+#endif
- if (strlen (device_path) == 0)
- device_path = NULL;
-
diff --git a/devel/gvfs/files/patch-monitor_hal_Makefile.in b/devel/gvfs/files/patch-monitor_hal_Makefile.in
new file mode 100644
index 000000000000..2d1d2dfb7de5
--- /dev/null
+++ b/devel/gvfs/files/patch-monitor_hal_Makefile.in
@@ -0,0 +1,49 @@
+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 1ca0a2d7e0b4..2f9a88784eea 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -16,24 +16,14 @@ bin/gvfs-save
bin/gvfs-set-attribute
bin/gvfs-trash
bin/gvfs-tree
-etc/profile.d/gvfs-bash-completion.sh
include/gvfs-client/gvfs/gvfsurimapper.h
include/gvfs-client/gvfs/gvfsuriutils.h
-lib/gio/modules/libgioremote-volume-monitor.la
lib/gio/modules/libgioremote-volume-monitor.so
-lib/gio/modules/libgvfsdbus.la
lib/gio/modules/libgvfsdbus.so
-%%AVAHI%%lib/libgvfscommon-dnssd.la
-%%AVAHI%%lib/libgvfscommon-dnssd.so
-%%AVAHI%%lib/libgvfscommon-dnssd.so.0
-%%AVAHI%%lib/libgvfscommon-dnssd.so.0.0.0
-lib/libgvfscommon.la
-lib/libgvfscommon.so
-lib/libgvfscommon.so.0
-lib/libgvfscommon.so.0.0.0
+lib/gvfs/libgvfscommon.so
+lib/gvfs/libgvfsdaemon.so
libexec/gvfsd-afp
libexec/gvfsd-afp-browse
-%%FUSE%%libexec/gvfs-fuse-daemon
%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
%%HAL%%libexec/gvfs-hal-volume-monitor
libexec/gvfsd
@@ -44,17 +34,40 @@ libexec/gvfsd-computer
libexec/gvfsd-dav
%%AVAHI%%libexec/gvfsd-dnssd
libexec/gvfsd-ftp
+%%FUSE%%libexec/gvfsd-fuse
%%GPHOTO2%%libexec/gvfsd-gphoto2
libexec/gvfsd-http
libexec/gvfsd-localtest
libexec/gvfsd-metadata
libexec/gvfsd-network
libexec/gvfsd-sftp
-%%SMB%%libexec/gvfsd-smb
-%%SMB%%libexec/gvfsd-smb-browse
+%%SAMBA%%libexec/gvfsd-smb
+%%SAMBA%%libexec/gvfsd-smb-browse
libexec/gvfsd-trash
+man/man1/gvfs-cat.1.gz
+man/man1/gvfs-copy.1.gz
+man/man1/gvfs-info.1.gz
+man/man1/gvfs-ls.1.gz
+man/man1/gvfs-mime.1.gz
+man/man1/gvfs-mkdir.1.gz
+man/man1/gvfs-monitor-dir.1.gz
+man/man1/gvfs-monitor-file.1.gz
+man/man1/gvfs-mount.1.gz
+man/man1/gvfs-move.1.gz
+man/man1/gvfs-open.1.gz
+man/man1/gvfs-rename.1.gz
+man/man1/gvfs-rm.1.gz
+man/man1/gvfs-save.1.gz
+man/man1/gvfs-set-attribute.1.gz
+man/man1/gvfs-trash.1.gz
+man/man1/gvfs-tree.1.gz
+man/man1/gvfsd-fuse.1.gz
+man/man1/gvfsd-metadata.1.gz
+man/man1/gvfsd.1.gz
+man/man7/gvfs.7.gz
%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
-%%SMB%%share/GConf/gsettings/gvfs-smb.convert
+%%SAMBA%%share/GConf/gsettings/gvfs-smb.convert
+share/bash-completion/completions/gvfs
share/dbus-1/services/gvfs-daemon.service
share/dbus-1/services/gvfs-metadata.service
%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
@@ -74,8 +87,8 @@ share/gvfs/mounts/afp.mount
%%DATADIR%%/mounts/localtest.mount
%%DATADIR%%/mounts/network.mount
%%DATADIR%%/mounts/sftp.mount
-%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
-%%SMB%%%%DATADIR%%/mounts/smb.mount
+%%SAMBA%%%%DATADIR%%/mounts/smb-browse.mount
+%%SAMBA%%%%DATADIR%%/mounts/smb.mount
%%DATADIR%%/mounts/trash.mount
%%DATADIR%%/remote-volume-monitors/.keep
%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
@@ -142,6 +155,7 @@ share/locale/sr@latin/LC_MESSAGES/gvfs.mo
share/locale/sv/LC_MESSAGES/gvfs.mo
share/locale/ta/LC_MESSAGES/gvfs.mo
share/locale/te/LC_MESSAGES/gvfs.mo
+share/locale/tg/LC_MESSAGES/gvfs.mo
share/locale/th/LC_MESSAGES/gvfs.mo
share/locale/tr/LC_MESSAGES/gvfs.mo
share/locale/ug/LC_MESSAGES/gvfs.mo
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 06:42:36 +0000