[Midnightbsd-cvs] mports [19304] trunk/devel/gvfs/files: gvfs 1.20.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jun 1 22:11:45 EDT 2015
Revision: 19304
http://svnweb.midnightbsd.org/mports/?rev=19304
Author: laffer1
Date: 2015-06-01 22:11:44 -0400 (Mon, 01 Jun 2015)
Log Message:
-----------
gvfs 1.20.3
Added Paths:
-----------
trunk/devel/gvfs/files/patch-common_Makefile.in
trunk/devel/gvfs/files/patch-common_gvfsdbusutils.c
trunk/devel/gvfs/files/patch-common_gvfsdbusutils.h
Removed Paths:
-------------
trunk/devel/gvfs/files/patch-Makefile.in
trunk/devel/gvfs/files/patch-config.h.in
trunk/devel/gvfs/files/patch-configure
trunk/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c
trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
Deleted: trunk/devel/gvfs/files/patch-Makefile.in
===================================================================
--- trunk/devel/gvfs/files/patch-Makefile.in 2015-06-02 02:11:03 UTC (rev 19303)
+++ trunk/devel/gvfs/files/patch-Makefile.in 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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 = \
Added: trunk/devel/gvfs/files/patch-common_Makefile.in
===================================================================
--- trunk/devel/gvfs/files/patch-common_Makefile.in (rev 0)
+++ trunk/devel/gvfs/files/patch-common_Makefile.in 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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@
+- at HAVE_AVAHI_TRUE@am__append_1 = libgvfscommon-dnssd.la
++ at USE_HAL_TRUE@am__append_1 = \
++ at USE_HAL_TRUE@ gvfsdbusutils.c gvfsdbusutils.h
++
++ at USE_HAL_TRUE@am__append_2 = \
++ at USE_HAL_TRUE@ $(DBUS_CFLAGS)
++
++ at 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
++ at 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_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at 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)
+
++ at USE_HAL_TRUE@libgvfscommon_la_LIBADD = \
++ at 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
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmountoperationdbus.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmountsource.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmountspec.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gmounttracker.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvfsdaemonprotocol.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvfsdbus.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvfsfileinfo.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvfsicon.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdresolver.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdutils.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gmountsource.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gmountspec.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gmounttracker.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_la-gvfsicon.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgvfscommon_monitor_la-gvfsmountinfo.Plo at am__quote@
+
+ .c.o:
+@@ -661,6 +678,69 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountspec.Tpo $(DEPDIR)/libgvfscommon_la-gmountspec.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountspec.c' object='libgvfscommon_la-gmountspec.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Tpo $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountoperationdbus.c' object='libgvfscommon_la-gmountoperationdbus.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountsource.Tpo $(DEPDIR)/libgvfscommon_la-gmountsource.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountsource.c' object='libgvfscommon_la-gmountsource.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmounttracker.Tpo $(DEPDIR)/libgvfscommon_la-gmounttracker.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmounttracker.c' object='libgvfscommon_la-gmounttracker.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdaemonprotocol.c' object='libgvfscommon_la-gvfsdaemonprotocol.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsicon.Tpo $(DEPDIR)/libgvfscommon_la-gvfsicon.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsicon.c' object='libgvfscommon_la-gvfsicon.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Tpo $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsfileinfo.c' object='libgvfscommon_la-gvfsfileinfo.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbus.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbus.c' object='libgvfscommon_la-gvfsdbus.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
++ at 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
++ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbusutils.c' object='libgvfscommon_la-gvfsdbusutils.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
+
Property changes on: trunk/devel/gvfs/files/patch-common_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/gvfs/files/patch-common_gvfsdbusutils.c
===================================================================
--- trunk/devel/gvfs/files/patch-common_gvfsdbusutils.c (rev 0)
+++ trunk/devel/gvfs/files/patch-common_gvfsdbusutils.c 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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 at 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 ();
++}
Property changes on: trunk/devel/gvfs/files/patch-common_gvfsdbusutils.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/gvfs/files/patch-common_gvfsdbusutils.h
===================================================================
--- trunk/devel/gvfs/files/patch-common_gvfsdbusutils.h (rev 0)
+++ trunk/devel/gvfs/files/patch-common_gvfsdbusutils.h 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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 at 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__ */
Property changes on: trunk/devel/gvfs/files/patch-common_gvfsdbusutils.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/devel/gvfs/files/patch-config.h.in
===================================================================
--- trunk/devel/gvfs/files/patch-config.h.in 2015-06-02 02:11:03 UTC (rev 19303)
+++ trunk/devel/gvfs/files/patch-config.h.in 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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
-
Deleted: trunk/devel/gvfs/files/patch-configure
===================================================================
--- trunk/devel/gvfs/files/patch-configure 2015-06-02 02:11:03 UTC (rev 19303)
+++ trunk/devel/gvfs/files/patch-configure 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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;}
Deleted: trunk/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c
===================================================================
--- trunk/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c 2015-06-02 02:11:03 UTC (rev 19303)
+++ trunk/devel/gvfs/files/patch-daemon_gvfsbackendcdda.c 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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");
Deleted: trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
===================================================================
--- trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c 2015-06-02 02:11:03 UTC (rev 19303)
+++ trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c 2015-06-02 02:11:44 UTC (rev 19304)
@@ -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);
More information about the Midnightbsd-cvs
mailing list