[jhbuild] udisks: Removing from gnome-suites-core-3.26.modules, making it a sysdep

[Tristan Van Berkom <tvb src gnome org>]

commit 2ba070b73617b6869a4207510635faa65bec273f
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Wed Jun 21 20:04:53 2017 +0900

    udisks: Removing from gnome-suites-core-3.26.modules, making it a sysdep
    
    Since recent versions, building a bleeding edge version of udisks is
    difficult and pulls in some new bleeding edge dependencies such
    as libblockdev, libbytesize and libvolume_key.
    
    However udisks is available in LTS distros for the versions which
    we require for gnome-disk-utility and gvfs, so lets just turn this
    into a system dependency.

 modulesets/gnome-suites-core-3.26.modules |   17 -----------------
 modulesets/gnome-sysdeps-3.26.modules     |    5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 3e998fd..837ae3b 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -1260,23 +1260,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="udisks" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>udisks2.pc</pkg-config>
-    <branch repo="github.com" module="storaged-project/udisks"/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="gudev"/>
-      <dep package="libacl"/>
-      <dep package="polkit-gobject"/>
-      <dep package="polkit-agent"/>
-      <dep package="libatasmart"/>
-      <dep package="m4-common"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <autotools id="upower"
              supports-non-srcdir-builds="no"
              autogenargs="--with-systemdsystemunitdir=no">
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index adc3a01..1582c86 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -1097,6 +1097,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="udisks">
+    <pkg-config>udisks2.pc</pkg-config>
+    <branch repo="system" version="2.1.1"/>
+  </systemmodule>
+
   <systemmodule id="valgrind">
     <pkg-config>valgrind.pc</pkg-config>
     <branch repo="system" version="3.10.0"/>