[jhbuild] 3.26: Move udisks back to sysdeps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 2761f01f3e316eb1cef7ac1e1d804ef0e78384db
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Aug 8 15:06:59 2017 -0500

    3.26: Move udisks back to sysdeps
    
    libblkdev has tons of dependencies, and there seems to be limited value
    in building a crippled version of it when gnome-disks still works just
    fine with older system versions of udisks.
    
    Also, add a warning not to add non-tarball GitHub modules to core-deps
    unless tarballs are hosted elsewhere.

 modulesets/gnome-suites-core-deps-3.26.modules |   44 ++++++-----------------
 modulesets/gnome-sysdeps-3.26.modules          |   12 ++++--
 2 files changed, 20 insertions(+), 36 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 2c793a8..b102ee5 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -10,13 +10,23 @@
     href="https://gitlab.gnome.org/"/>
 <repository type="git" name="git.freedesktop.org"
     href="https://anongit.freedesktop.org/git/"/>
-<repository type="git" name="github.com"
-    href="https://github.com/"/>
 <repository type="git" name="gitlab.com"
     href="https://gitlab.com/"/>
 <repository type="git" name="pagure.io"
     href="https://pagure.io/"/>
 
+<!-- WARNING: github.com is only allowed here under one of two conditions:
+
+  (a) The module has tarball releases elsewhere (e.g. GNOME infrastructure)
+  (b) The module is always built from tarball, never from git
+
+If (a) does not apply then you must build from tarball (github-tar) if adding
+a GitHub module here. Otherwise our release infrastructure will fail to handle
+the module and we will just change it to use a tarball anyway.
+-->
+<repository type="git" name="github.com"
+    href="https://github.com/"/>
+
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
     href="https://cairographics.org/"/>
@@ -42,8 +52,6 @@
     href="http://xorg.freedesktop.org/"/>
 <repository type="tarball" name="github-tar"
     href="https://github.com/"/>
-<repository type="tarball" name="tarball.github.com"
-    href="https://github.com/"/>
 <!-- FIXME: Not available via HTTPS -->
 <repository type="tarball" name="pcre"
     href="http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
@@ -1075,27 +1083,6 @@
     </suggests>
   </meson>
 
-  <autotools id="libblockdev"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix=%(prefix)s 
%(autogenargs)s"
-             autogenargs="--without-gtk-doc">
-    <branch repo="github.com" module="storaged-project/libblockdev"/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="m4-common"/>
-      <dep package="libbytesize"/>
-      <dep package="libvolume_key"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libbytesize"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix=%(prefix)s 
%(autogenargs)s"
-             autogenargs="--without-gtk-doc">
-    <branch repo="github.com" module="rhinstaller/libbytesize"/>
-    <dependencies>
-      <dep package="m4-common"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="libchamplain" autogenargs="--enable-vala">
    <branch/>
    <dependencies>
@@ -1488,13 +1475,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libvolume_key" autogen-sh="autoreconf">
-    <branch repo="pagure.io" module="volume_key"/>
-    <dependencies>
-      <dep package="m4-common"/>
-    </dependencies>
-  </autotools>
-
   <!-- Deprecated -->
   <autotools id="libwnck">
     <branch/>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index 65d0cde..672a915 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -127,10 +127,9 @@
   </systemmodule>
 
   <systemmodule id="device-mapper">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="libdevmapper.h"/>
-    </systemdependencies>
+    <pkg-config>devmapper.pc</pkg-config>
+    <branch repo="system"
+            version="1.02.93"/>
   </systemmodule>
 
   <systemmodule id="docbook-utils">
@@ -1108,6 +1107,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"/>