Hello community,

here is the log from the commit of package gvfs for openSUSE:Factory checked in 
at 2018-03-14 19:28:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gvfs (Old)
 and      /work/SRC/openSUSE:Factory/.gvfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gvfs"

Wed Mar 14 19:28:02 2018 rev:147 rq:586199 version:1.36.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes        2018-03-08 
10:53:06.382825905 +0100
+++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes   2018-03-14 
19:28:02.996616383 +0100
@@ -1,0 +2,103 @@
+Mon Mar 12 15:16:12 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.36.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Mar  7 18:27:01 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.35.92:
+  + build: Print summary of the options in meson.
+  + smb: Avoid "Error: Success" failure messages.
+  + Several smaller bugfixes.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:51 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:51 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.35.91:
+  + mtp: Prevent crashes if device is unplugged during mount
+    operation.
+  + daemon: Fix admin backend spawning on some systems.
+  + google: Return error properly when trying to replace native
+    files.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Add permissions PreReq on gvfs-backend: used to apply the correct
+  permission set on the nfs daemon.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:50 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.35.90:
+  + build: Several FreeBSD related fixes
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:04 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.35.4:
+  + recent: Prevent crash when recent file changed.
+  + trash: Fix trash::orig-path for relative paths.
+  + Several smaller bugfixes.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:03 UTC 2018 - fezh...@suse.com
+
+- Update to version 1.35.3:
+  + mtp: Handle read-past-EOF ourselves to prevent hangs.
+  + Port several parts to GTask.
+  + Several smaller bugfixes.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:02 UTC 2018 - luc1...@linuxmail.org
+
+- Update to version 1.35.2:
+  + metadata: Remove udev dependency in favor of gudev.
+  + build:
+    - Enable elogind support in meson;
+    - Port to meson build system.
+  + gphoto2: Fix volume removal with current udev behavior.
+  + mtp: Fix volume removal with current udev behavior.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Update Url to https://wiki.gnome.org/Projects/gvfs: current GVfs'
+  web page.
+- Drop fixed upstream patches:
+  + gvfs-fix-mtp-volume-removal.patch and;
+  + gvfs-mtp-handle-read-past-eof.patch.
+- Port the following patches from autotools to meson:
+  + gvfs-nvvfs.patch and;
+  + gvfs-nds.patch.
+- Drop autoconf, libtool BuildRequires and add meson. Following,
+  drop configure, make and make_install macros and adopt meson,
+  meson_build and meson_install macros. And pass the due parameters
+  to meson. All of these changes reflect the upstream porting to
+  Meson Build System.
+- %glib2_gsettings_schema_requires macro as it's no longer needed
+  since RPM file triggers.
+- Drop intltool BuildRequires once upstream did the migration to
+  gettext long ago and deviations are not desired to avoid
+  unexpected bugs.
+- Add pkgconfig(gmodule-no-export-2.0) BuildRequires: it was
+  already being pulled with pkgconfig(glib-2.0) and used, since
+  they live in the same devel package.
+- Add openssh BuildRequires: missing ssh program dependency that
+  meson checks brought up while autotool's configure was being too
+  permissive when letting libssh2 satisfy its checks.
+
+-------------------------------------------------------------------
+Wed Mar  7 01:35:01 UTC 2018 - dims...@opensuse.org
+
+- Update to version 1.35.1:
+  + sftp: Add support for setting timestamps.
+  + Several smaller bugfixes.
+
+-------------------------------------------------------------------
@@ -31 +134 @@
-- Re-enabele caps(cap_net_bind_service=+ep)for gvfsd-nfs: the
+- Re-enable caps(cap_net_bind_service=+ep) for gvfsd-nfs: the

Old:
----
  gvfs-1.34.2.1.tar.xz

New:
----
  gvfs-1.36.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gvfs.spec ++++++
--- /var/tmp/diff_new_pack.PhDu6h/_old  2018-03-14 19:28:04.108576897 +0100
+++ /var/tmp/diff_new_pack.PhDu6h/_new  2018-03-14 19:28:04.112576756 +0100
@@ -19,34 +19,36 @@
 %define with_udisks2 1
 %define with_cdda 1
 Name:           gvfs
-Version:        1.34.2.1
+Version:        1.36.0
 Release:        0
 Summary:        Virtual File System functionality for GLib
-License:        LGPL-2.0+ AND GPL-3.0
+License:        LGPL-2.0-or-later AND GPL-3.0-only
 Group:          Development/Libraries/C and C++
-URL:            http://www.gnome.org
-Source0:        
http://download.gnome.org/sources/gvfs/1.34/%{name}-%{version}.tar.xz
+URL:            https://wiki.gnome.org/Projects/gvfs
+Source0:        
http://download.gnome.org/sources/gvfs/1.36/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksam...@novell.com -- Provides gvfs 
backend for novell nautilus plugin
-Patch5:         gvfs-nvvfs.patch
+### NOTE: Please, keep SLE-only patches at bottom (starting on 1000).
 # PATCH-FEATURE-SLE gvfs-nds.patch ksam...@novell.com -- Provides NDS browsing 
for nautilus
-Patch6:         gvfs-nds.patch
+Patch1000:      gvfs-nds.patch
+# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksam...@novell.com -- Provides gvfs 
backend for novell nautilus plugin
+Patch1001:      gvfs-nvvfs.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fuse-devel
-BuildRequires:  intltool
 BuildRequires:  libarchive-devel
 BuildRequires:  libavahi-glib-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  libimobiledevice-devel >= 1.2
 BuildRequires:  libsoup-devel >= 2.34.0
-BuildRequires:  libtool
+BuildRequires:  meson
+BuildRequires:  openssh
 BuildRequires:  pkgconfig
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(gcr-base-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.51.0
+BuildRequires:  pkgconfig(gmodule-no-export-2.0)
 BuildRequires:  pkgconfig(goa-1.0) >= 3.17.1
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gudev-1.0) >= 147
@@ -64,12 +66,8 @@
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
-%glib2_gio_module_requires
+%{glib2_gio_module_requires}
 %{?systemd_requires}
-%if !0%{?is_opensuse}
-# needed for patches 5 and 6
-BuildRequires:  autoconf
-%endif
 %if %{with_cdda}
 BuildRequires:  pkgconfig(libcdio_paranoia) >= 0.78.2
 %endif
@@ -95,33 +93,35 @@
 not using GIO to access the GVfs filesystems.
 
 %package backend-afc
+%define mobile_device_package %(rpm -q --qf "%%{name}" -f $(readlink -f 
%{_libdir}/libimobiledevice.so))
 Summary:        VFS functionality for GLib -- iPod / iPhone Support
 License:        LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-Supplements:    packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f 
%{_libdir}/llibimobiledevice.so)))
+Supplements:    packageand(gvfs:%{mobile_device_package})
 
 %description backend-afc
 This package provides a gvfs backend that supports iPod / iPhone devices.
 
 %package backend-samba
+%define smb_client_package %(rpm -q --qf "%%{name}" -f $(readlink -f 
%{_libdir}/libsmbclient.so))
 Summary:        VFS functionality for GLib -- Samba Support
 License:        LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       %{name}-backends = %{version}
-Supplements:    packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f 
%{_libdir}/libsmbclient.so)))
-%glib2_gsettings_schema_requires
+Supplements:    packageand(gvfs:%{smb_client_package})
 
 %description backend-samba
 This package provides a gvfs backend that supports Samba.
 
 %package backends
 Summary:        VFS functionality for GLib
-License:        LGPL-2.0+ AND GPL-3.0
+License:        LGPL-2.0-or-later AND GPL-3.0-only
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-%glib2_gsettings_schema_requires
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         permissions
 %if %{with_udisks2}
 Recommends:     udisks2
 %endif
@@ -167,34 +167,31 @@
 %setup -q
 %if !0%{?is_opensuse}
 translation-update-upstream
-%patch5 -p1
-%patch6 -p1
+%patch1000 -p1
+%patch1001 -p1
 %endif
 
 %build
-%if !0%{?is_opensuse}
-# needed for patches 5 and 6
-autoreconf
-%endif
-%configure \
+%meson \
     --libexecdir=%{_libexecdir}/%{name} \
 %if %{with_udisks2}
-    --enable-udisks2 \
-    --disable-gdu \
+    -Dudisks2=true \
+    -Dgdu=false \
 %else
-    --disable-udisks2 \
-    --enable-gdu \
+    -Dudisks2=false \
+    -Dgdu=true \
 %endif
-    --disable-static
-make %{?_smp_mflags}
+    -Dman=true \
+    %{nil}
+%meson_build
 
 %install
-%make_install
-find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
+%meson_install
+find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}
 
 %post
-%glib2_gio_module_post
+%{glib2_gio_module_post}
 
 %post fuse
 %tmpfiles_create %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf
@@ -206,12 +203,11 @@
 %verify_permissions -e %{_libexecdir}/%{name}/gvfsd-nfs
 
 %postun
-%glib2_gio_module_postun
+%{glib2_gio_module_postun}
 
 %files
-%defattr(-, root, root)
+%license COPYING
 %doc AUTHORS NEWS README
-%{_bindir}/gvfs-*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/mounts
 %dir %{_datadir}/%{name}/remote-volume-monitors
@@ -232,14 +228,12 @@
 %{_userunitdir}/gvfs-metadata.service
 
 %files fuse
-%defattr(-, root, root)
 %{_libexecdir}/%{name}/gvfsd-fuse
 %dir %{_libexecdir}/tmpfiles.d
 %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf
 %{_mandir}/man1/gvfsd-fuse.1%{?ext_man}
 
 %files backend-afc
-%defattr(-, root, root)
 %{_libexecdir}/%{name}/gvfs-afc-volume-monitor
 %{_datadir}/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
 %{_userunitdir}/gvfs-afc-volume-monitor.service
@@ -248,7 +242,6 @@
 %{_datadir}/%{name}/mounts/afc.mount
 
 %files backend-samba
-%defattr(-, root, root)
 %{_libexecdir}/%{name}/gvfsd-smb
 %{_datadir}/%{name}/mounts/smb.mount
 %{_libexecdir}/%{name}/gvfsd-smb-browse
@@ -259,7 +252,6 @@
 %{_datadir}/GConf/gsettings/gvfs-smb.convert
 
 %files backends
-%defattr(-, root, root)
 %if %{with_udisks2}
 %doc monitor/udisks2/what-is-shown.txt
 %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service
@@ -325,8 +317,9 @@
 %endif
 %{_libexecdir}/%{name}/gvfsd-network
 %{_datadir}/%{name}/mounts/network.mount
-# allow priv ports for mounting nfs . Otherwise the nfs-service requires 
insecure (boo#1065864)
+# allow priv ports for mounting nfs. Otherwise the nfs-service requires 
insecure (boo#1065864)
 %verify(not mode caps) %caps(cap_net_bind_service=+ep) 
%{_libexecdir}/%{name}/gvfsd-nfs
+%{_libexecdir}/%{name}/gvfsd-nfs
 %{_datadir}/%{name}/mounts/nfs.mount
 %if !0%{?is_opensuse}
 %{_libexecdir}/%{name}/gvfsd-nvvfs
@@ -348,7 +341,7 @@
 %{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
 
 %files devel
-%defattr(-, root, root)
+%doc ChangeLog.pre-1-2 MAINTAINERS README.commits
 %{_includedir}/gvfs-client
 
 %files lang -f %{name}.lang

++++++ gvfs-1.34.2.1.tar.xz -> gvfs-1.36.0.tar.xz ++++++
++++ 171715 lines of diff (skipped)

++++++ gvfs-nds.patch ++++++
--- /var/tmp/diff_new_pack.PhDu6h/_old  2018-03-14 19:28:05.632522782 +0100
+++ /var/tmp/diff_new_pack.PhDu6h/_new  2018-03-14 19:28:05.636522641 +0100
@@ -1,9 +1,9 @@
-Index: gvfs-1.34.0/daemon/gvfsbackendnds.c
+Index: b/daemon/gvfsbackendnds.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gvfs-1.34.0/daemon/gvfsbackendnds.c        2017-09-15 10:53:24.564258329 
+0200
+--- /dev/null
++++ b/daemon/gvfsbackendnds.c
 @@ -0,0 +1,747 @@
-+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
 + *
 + * Copyright (C) 2006-2007 Red Hat, Inc.
@@ -750,10 +750,11 @@
 +{
 +  g_set_application_name (_("Displaying Embedded Objects"));
 +}
-Index: gvfs-1.34.0/daemon/gvfsbackendnds.h
+
+Index: b/daemon/gvfsbackendnds.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gvfs-1.34.0/daemon/gvfsbackendnds.h        2017-09-15 10:53:56.159989373 
+0200
+--- /dev/null
++++ b/daemon/gvfsbackendncs.h
 @@ -0,0 +1,53 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + *
@@ -808,48 +809,61 @@
 +G_END_DECLS
 +
 +#endif /* __G_VFS_BACKEND_NDS_H__ */
-Index: gvfs-1.34.0/daemon/Makefile.am
+
+Index: b/meson_options.txt
 ===================================================================
---- gvfs-1.34.0.orig/daemon/Makefile.am        2017-09-15 10:15:10.715090208 
+0200
-+++ gvfs-1.34.0/daemon/Makefile.am     2017-09-15 10:15:46.554940823 +0200
-@@ -144,6 +144,10 @@
- mount_DATA += nvvfs.mount
- libexec_PROGRAMS += gvfsd-nvvfs
- 
-+mount_in_files += nds.mount.in
-+mount_DATA += nds.mount
-+libexec_PROGRAMS += gvfsd-nds
-+
- EXTRA_DIST =                          \
-       $(service_in_files)             \
-       $(systemd_user_in_files)        \
-@@ -528,6 +532,19 @@
- 
- gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -15,6 +15,7 @@ option('google', type: 'boolean', value:
+ option('gphoto2', type: 'boolean', value: true, description: 'build with 
gphoto2 backend and volume monitor')
+ option('http', type: 'boolean', value: true, description: 'build with 
http/dav backends')
+ option('mtp', type: 'boolean', value: true, description: 'build with mtp 
backend and volume monitor')
++option('nds', type: 'boolean', value: true, description: 'build with nds 
backend')
+ option('nfs', type: 'boolean', value: true, description: 'build with nfs 
backend')
+ option('smb', type: 'boolean', value: true, description: 'build with smb 
backends')
+ option('udisks2', type: 'boolean', value: true, description: 'build with 
udisks2 volume monitor')
+
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -465,6 +465,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
+ # *** AFP backend ***
+ enable_afp = get_option('afp')
  
-+gvfsd_nds_SOURCES = \
-+        gvfsbackendnds.c gvfsbackendnds.h \
-+        daemon-main.c daemon-main.h \
-+        daemon-main-generic.c
-+
-+gvfsd_nds_CPPFLAGS = $(flags) \
-+        -DBACKEND_HEADER=gvfsbackendnds.h \
-+        -DDEFAULT_BACKEND_TYPE=nds \
-+        -DMAX_JOB_THREADS=1 \
-+        -DBACKEND_TYPES='"nds", G_VFS_TYPE_BACKEND_NDS,'
-+
-+gvfsd_nds_LDADD = $(libraries) -ldl
-+
- gvfsd_nvvfs_SOURCES = \
-         gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
-         daemon-main.c daemon-main.h \
-Index: gvfs-1.34.0/daemon/nds.mount.in
++# *** NDS backend ***
++enable_nds = get_option('nds')
++if enable_nds
++  libdl_dep = cc.find_library('dl')
++endif
++
+ # *** NFS backend ***
+ enable_nfs = get_option('nfs')
+ if enable_nfs
+
+Index: b/daemon/meson.build
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ gvfs-1.34.0/daemon/nds.mount.in    2017-09-15 10:15:46.554940823 +0200
-@@ -0,0 +1,5 @@
-+[Mount]
-+Type=nds
-+Exec=@libexecdir@/gvfsd-nds
-+AutoMount=false
-+Scheme=nds
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -562,6 +562,22 @@ if enable_afp
+   mounts += ['afp-browse']
+ endif
+ 
++if enable_nds
++  sources = daemon_main_sources + files('gvfsbackendnds.c')
++
++  deps = [libdl_dep]
++
++  cflags = [
++      '-DBACKEND_HEADER=gvfsbackendnds.h',
++      '-DDEFAULT_BACKEND_TYPE=nds',
++      '-DBACKEND_TYPES="nds", G_VFS_TYPE_BACKEND_NDS',
++      '-DMAX_JOB_THREADS=1'
++  ]
++
++  programs += [['gvfsd-nds', sources, deps, cflags]]
++  mounts += ['nds']
++endif
++
+ if enable_nfs
+   sources = files('gvfsbackendnfs.c')

++++++ gvfs-nvvfs.patch ++++++
--- /var/tmp/diff_new_pack.PhDu6h/_old  2018-03-14 19:28:05.684520936 +0100
+++ /var/tmp/diff_new_pack.PhDu6h/_new  2018-03-14 19:28:05.688520794 +0100
@@ -1,9 +1,9 @@
-Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.c
+Index: b/daemon/gvfsbackendnvvfs.c
 ===================================================================
 --- /dev/null
-+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.c
++++ b/daemon/gvfsbackendnvvfs.c
 @@ -0,0 +1,591 @@
-+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
 + * Copyright (C) 2006-2007 Red Hat, Inc.
@@ -594,10 +594,11 @@
 +  backend_class->try_query_info = try_query_info;
 +  backend_class->try_enumerate = try_enumerate;
 +}
-Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.h
+
+Index: b/daemon/gvfsbackendnvvfs.h
 ===================================================================
 --- /dev/null
-+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.h
++++ b/daemon/gvfsbackendnvvfs.h
 @@ -0,0 +1,50 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
@@ -649,49 +650,58 @@
 +G_END_DECLS
 +
 +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
-Index: gvfs-1.15.1/daemon/Makefile.am
+
+Index: b/meson_options.txt
 ===================================================================
---- gvfs-1.15.1.orig/daemon/Makefile.am
-+++ gvfs-1.15.1/daemon/Makefile.am
-@@ -139,6 +139,10 @@ endif
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,7 @@ option('http', type: 'boolean', value: t
+ option('mtp', type: 'boolean', value: true, description: 'build with mtp 
backend and volume monitor')
+ option('nds', type: 'boolean', value: true, description: 'build with nds 
backend')
+ option('nfs', type: 'boolean', value: true, description: 'build with nfs 
backend')
++option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs 
backend')
+ option('smb', type: 'boolean', value: true, description: 'build with smb 
backends')
+ option('udisks2', type: 'boolean', value: true, description: 'build with 
udisks2 volume monitor')
  
- noinst_DATA = $(mount_DATA:.mount=.localmount)
- 
-+mount_in_files += nvvfs.mount.in
-+mount_DATA += nvvfs.mount
-+libexec_PROGRAMS += gvfsd-nvvfs
-+
- EXTRA_DIST =                          \
-       $(service_in_files)             \
-       $(systemd_user_in_files)        \
-@@ -521,6 +525,20 @@ gvfsd_http_CPPFLAGS = \
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -477,6 +477,9 @@ if enable_nfs
+   libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
+ endif
  
- gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
++# *** NVVFS backend ***
++enable_nvvfs = get_option('nvvfs')
++
+ # *** Enable development utils ***
+ enable_devel_utils = get_option('devel_utils')
+ enable_installed_tests = get_option('installed_tests')
  
-+gvfsd_nvvfs_SOURCES = \
-+        gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
-+        daemon-main.c daemon-main.h \
-+        daemon-main-generic.c
-+
-+gvfsd_nvvfs_CPPFLAGS = $(flags) \
-+        -DBACKEND_HEADER=gvfsbackendnvvfs.h \
-+        -DDEFAULT_BACKEND_TYPE=nvvfs \
-+        -DMAX_JOB_THREADS=1 \
-+        -DBACKEND_TYPES='"nvvfs", G_VFS_TYPE_BACKEND_NVVFS,'
-+
-+gvfsd_nvvfs_LDADD = $(libraries)
-+
-+
- gvfsd_dav_SOURCES = \
-       gvfshttpinputstream.c gvfshttpinputstream.h \
-       gvfsbackendhttp.c gvfsbackendhttp.h \
-Index: gvfs-1.15.1/daemon/nvvfs.mount.in
+Index: b/daemon/meson.build
 ===================================================================
---- /dev/null
-+++ gvfs-1.15.1/daemon/nvvfs.mount.in
-@@ -0,0 +1,5 @@
-+[Mount]
-+Type=nvvfs
-+Exec=@libexecdir@/gvfsd-nvvfs
-+AutoMount=false
-+Scheme=nvvfs
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -594,6 +594,22 @@ if enable_nfs
+   mounts += ['nfs']
+ endif
+ 
++if enable_nvvfs
++  sources = daemon_main_sources + files('gvfsbackendnvvfs.c')
++
++  deps = []
++
++  cflags = [
++      '-DBACKEND_HEADER=gvfsbackendnvvfs.h',
++      '-DDEFAULT_BACKEND_TYPE=nvvfs',
++      '-DBACKEND_TYPES="nvvfs", G_VFS_TYPE_BACKEND_NVVFS',
++      '-DMA_JOB_THREADS=1'
++  ]
++
++  programs += [['gvfsd-nvvfs', sources, deps, cflags]]
++  mounts += ['nvvfs']
++endif
++
+ foreach program: programs
+   executable(
+     program[0],
\ No newline at end of file


Reply via email to