[jhbuild] core-3.28: gvfs now uses meson

[Iñigo Martínez <inigomartinez src gnome org>]

commit ed10b16ea6a58e1b378230040c5f1e389cab5399
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue Oct 31 21:51:08 2017 +0100

    core-3.28: gvfs now uses meson
    
    Although autotools is still present, it will be removed on the
    future. This patch changes the default build system to meson.
    
    One of the changes of meson is that auto options have been changed
    to boolean options, so unsupported features must be explicitly
    disabled. In order to test all the available features in gvfs, this
    patch also adds support for new system dependencies.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=789736

 modulesets/gnome-suites-core-3.28.modules |   35 +++++++++++++++++++---------
 modulesets/gnome-sysdeps-3.28.modules     |   33 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 11 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.28.modules b/modulesets/gnome-suites-core-3.28.modules
index 234ca02..04d2353 100644
--- a/modulesets/gnome-suites-core-3.28.modules
+++ b/modulesets/gnome-suites-core-3.28.modules
@@ -433,32 +433,45 @@
     </dependencies>
   </autotools>
 
- <autotools id="gvfs">
+  <meson id="gvfs" mesonargs="-Dwith-systemduserunitdir=no -Dwith-tmpfilesdir=no 
-Denable-installed-tests=true">
     <if condition-unset="linux">
-      <autogenargs value="--disable-admin"/>
+      <mesonargs value="-Denable-admin=false"/>
     </if>
     <branch/>
     <dependencies>
-      <dep package="glib"/>
+      <dep package="avahi-client"/>
+      <dep package="avahi-glib"/>
       <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="gcr"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gudev"/>
+      <dep package="libarchive"/>
+      <dep package="libbluray"/>
       <dep package="libcap"/>
+      <dep package="libcdio-paranoia"/>
       <dep package="libgcrypt"/>
+      <dep package="libgdata"/>
+      <dep package="libgphoto2"/>
+      <dep package="libimobiledevice"/>
+      <dep package="libplist"/>
+      <dep package="libsecret"/>
       <dep package="libsoup"/>
-      <dep package="gcr"/>
+      <dep package="libusb1"/>
+      <dep package="libxml2"/>
+      <dep package="polkit-gobject"/>
+      <dep package="smbclient"/>
       <if condition-set="linux">
         <dep package="udisks"/>
       </if>
       <if condition-set="systemd">
         <dep package="libsystemd"/>
       </if>
-    </dependencies>
-    <suggests>
-      <dep package="libgphoto2"/>
-      <if condition-set="linux">
-        <dep package="libgudev"/>
+      <if condition-unset="systemd">
+        <mesonargs value="-Denable-logind=false"/>
       </if>
-    </suggests>
-  </autotools>
+    </dependencies>
+  </meson>
 
   <autotools id="mousetweaks">
     <branch/>
diff --git a/modulesets/gnome-sysdeps-3.28.modules b/modulesets/gnome-sysdeps-3.28.modules
index 59e2556..6cf5b67 100644
--- a/modulesets/gnome-sysdeps-3.28.modules
+++ b/modulesets/gnome-sysdeps-3.28.modules
@@ -247,6 +247,11 @@
             version="12.0.6"/>
   </systemmodule>
 
+  <systemmodule id="fuse">
+    <pkg-config>fuse.pc</pkg-config>
+    <branch repo="system" version="2.9.7"/>
+  </systemmodule>
+
   <systemmodule id="fwupdate">
     <pkg-config>fwup.pc</pkg-config>
     <branch repo="system" version="5"/>
@@ -341,11 +346,39 @@
             version="2.26.0"/>
   </systemmodule>
 
+  <systemmodule id="libbluray">
+    <pkg-config>libbluray.pc</pkg-config>
+    <branch repo="system" version="1.0.1"/>
+  </systemmodule>
+
+  <systemmodule id="libcdio-paranoia">
+    <pkg-config>libcdio_paranoia.pc</pkg-config>
+    <branch repo="system" version="0.83"/>
+  </systemmodule>
+
   <systemmodule id="libgudev">
     <pkg-config>gudev-1.0.pc</pkg-config>
     <branch repo="system" version="232"/>
   </systemmodule>
 
+  <systemmodule id="libimobiledevice">
+    <pkg-config>libimobiledevice-1.0.pc</pkg-config>
+    <branch repo="system"
+            version="1.2.0"/>
+  </systemmodule>
+
+  <systemmodule id="libmtp">
+    <pkg-config>libmtp.pc</pkg-config>
+    <branch repo="system"
+            version="1.1.13"/>
+  </systemmodule>
+
+  <systemmodule id="libplist">
+    <pkg-config>libplist.pc</pkg-config>
+    <branch repo="system"
+            version="2.0.0"/>
+  </systemmodule>
+
   <systemmodule id="highlight">
     <branch repo="system"/>
     <systemdependencies>