[jhbuild/wip/tvb/build-udisks] udisks: Since recently udisks depends on blockdev

[Tristan Van Berkom <tvb src gnome org>]

commit c0bb55005826ef17c16394938c32563720dd19ad
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Tue Jun 20 14:16:43 2017 +0900

    udisks: Since recently udisks depends on blockdev
    
    blockdev, from the storaged-project, also pulls in it's own
    libbytesize and depends on another library called volume_key,
    all of these are not readily available to adding these to
    gnome-core-deps-3.26.modules
    
    Also, some new system dependencies were required for blockdev
    and it's dependencies.

 modulesets/gnome-suites-core-3.26.modules      |    1 +
 modulesets/gnome-suites-core-deps-3.26.modules |   33 ++++++++++++++++++++
 modulesets/gnome-sysdeps-3.26.modules          |   38 +++++++++++++++++++++++-
 3 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 8d5b52b..687d70a 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -1263,6 +1263,7 @@
     <pkg-config>udisks2.pc</pkg-config>
     <branch repo="github.com" module="storaged-project/udisks"/>
     <dependencies>
+      <dep package="blockdev"/>
       <dep package="gobject-introspection"/>
       <dep package="gudev"/>
       <dep package="libacl"/>
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 46142f6..5eda040 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -26,6 +26,8 @@
       href="https://gitlab.com/"/>
 <repository type="git" name="git.libvirt.org"
     href="git://libvirt.org/"/>
+<repository type="git" name="git.pagure.io"
+    href="https://pagure.io/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
@@ -128,6 +130,25 @@
     <branch/>
   </autotools>
 
+  <autotools id="blockdev" autogen-sh="autoreconf">
+    <branch repo="github.com" module="storaged-project/libblockdev.git"/>
+     <dependencies>
+       <dep package="bytesize"/>
+       <dep package="device-mapper"/>
+       <dep package="dmraid"/>
+       <dep package="libkmod"/>
+       <dep package="libparted"/>
+       <dep package="volume_key"/>
+     </dependencies>
+  </autotools>
+
+  <autotools id="bytesize" autogen-sh="autoreconf">
+    <branch repo="github.com" module="storaged-project/libbytesize.git"/>
+     <dependencies>
+       <dep package="mpfr"/>
+     </dependencies>
+  </autotools>
+
   <autotools id="cairomm-1.0" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.13.1"
@@ -1875,6 +1896,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="volume_key" autogen-sh="autoreconf">
+    <branch repo="git.pagure.io" module="volume_key.git"/>
+    <dependencies>
+      <dep package="blkid"/>
+      <dep package="glib"/>
+      <dep package="gnupg"/>
+      <dep package="libcryptsetup"/>
+      <dep package="nss"/>
+      <dep package="swig"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="wayland-protocols">
     <branch repo="wayland.freedesktop.org"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index adc3a01..74e04f0 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -41,6 +41,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="blkid">
+    <pkg-config>blkid.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="bluez">
     <pkg-config>bluez.pc</pkg-config>
     <branch repo="system"
@@ -127,9 +132,15 @@
   </systemmodule>
 
   <systemmodule id="device-mapper">
+    <pkg-config>devmapper.pc</pkg-config>
+    <branch repo="system"
+           version="1.02.93"/>
+  </systemmodule>
+
+  <systemmodule id="dmraid">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="c_include" name="libdevmapper.h"/>
+      <dep type="c_include" name="dmraid/dmraid.h"/>
     </systemdependencies>
   </systemmodule>
 
@@ -470,12 +481,24 @@
             version="2.0"/>
   </systemmodule>
 
+  <systemmodule id="libkmod">
+    <pkg-config>libkmod.pc</pkg-config>
+    <branch repo="system"
+            version="19"/>
+  </systemmodule>
+
   <systemmodule id="libmusicbrainz">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
     <branch repo="system"
             version="5.0"/>
   </systemmodule>
 
+  <systemmodule id="libparted">
+    <pkg-config>libparted.pc</pkg-config>
+    <branch repo="system"
+            version="3.1"/>
+  </systemmodule>
+
   <systemmodule id="libtool">
     <branch repo="system"/>
     <systemdependencies>
@@ -579,6 +602,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libcryptsetup">
+    <pkg-config>libcryptsetup.pc</pkg-config>
+    <branch repo="system"
+           version="1.6.7"/>
+  </systemmodule>
+
   <systemmodule id="libdb">
     <branch repo="system"/>
     <systemdependencies>
@@ -1085,6 +1114,13 @@
             version="0.12"/>
   </systemmodule>
 
+  <systemmodule id="swig">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="swig"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="taglib">
     <pkg-config>taglib.pc</pkg-config>
     <branch repo="system" version="1.5"/>