[jhbuild] Build UDisks again

[Kai Lüke <kailueke src gnome org>]

commit 509e807f039370a94d04bbbb8a2240e5d30cd97a
Author: Kai Lüke <kailueke riseup net>
Date:   Mon Jul 17 21:00:59 2017 +0200

    Build UDisks again
    
    Removing UDisks as system dependency because
    the dependencies are able to be built in
    jhbuild now.

 modulesets/gnome-suites-core-deps-3.26.modules |   42 ++++++++++++++++++++++++
 modulesets/gnome-sysdeps-3.26.modules          |    5 ---
 patches/libblockdev-autogen-configure.patch    |   17 +++++++++
 patches/libbytesize-autogen-configure.patch    |   17 +++++++++
 4 files changed, 76 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 74d1836..f3b3b87 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -14,6 +14,8 @@
     href="https://github.com/"/>
 <repository type="git" name="gitlab.com"
     href="https://gitlab.com/"/>
+<repository type="git" name="pagure.io"
+    href="https://pagure.io/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
@@ -1072,6 +1074,23 @@
     </suggests>
   </meson>
 
+  <autotools id="libblockdev" autogenargs="--without-gtk-doc">
+    <branch repo="github.com" module="storaged-project/libblockdev" 
patch="libblockdev-autogen-configure.patch"/>
+    <dependencies>
+      <dep package="pygobject"/>
+      <dep package="m4-common"/>
+      <dep package="libbytesize"/>
+      <dep package="libvolume_key"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libbytesize" autogenargs="--without-gtk-doc">
+    <branch repo="github.com" module="rhinstaller/libbytesize" patch="libbytesize-autogen-configure.patch"/>
+    <dependencies>
+      <dep package="m4-common"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="libchamplain" autogenargs="--enable-vala">
    <branch/>
    <dependencies>
@@ -1464,6 +1483,13 @@
     </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/>
@@ -1786,6 +1812,22 @@
     </suggests>
   </autotools>
 
+  <autotools id="udisks" autogenargs="--with-systemdsystemunitdir=no --disable-gtk-doc-html">
+    <branch repo="github.com" module="storaged-project/udisks"/>
+    <dependencies>
+      <dep package="gudev"/>
+      <dep package="libacl"/>
+      <dep package="polkit-gobject"/>
+      <dep package="polkit-agent"/>
+      <dep package="libatasmart"/>
+      <dep package="libblockdev"/>
+      <dep package="m4-common"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="uhttpmock" supports-non-srcdir-builds="no">
     <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index c4bf3e7..5583208 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -1103,11 +1103,6 @@
     </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"/>
diff --git a/patches/libblockdev-autogen-configure.patch b/patches/libblockdev-autogen-configure.patch
new file mode 100644
index 0000000..fd779ad
--- /dev/null
+++ b/patches/libblockdev-autogen-configure.patch
@@ -0,0 +1,17 @@
+diff --git a/autogen.sh b/autogen.sh
+index 1f63992..0ea7050 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -14,3 +14,12 @@ PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
+ aclocal --install || exit 1
+ autoreconf --verbose --force --install -Wno-portability || exit 1
+ popd
++if [ "$NOCONFIGURE" = "" ]; then
++        $srcdir/configure "$@" || exit 1
++
++        if [ "$1" = "--help" ]; then exit 0 else
++                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
++        fi
++else
++        echo "Skipping configure process."
++fi
diff --git a/patches/libbytesize-autogen-configure.patch b/patches/libbytesize-autogen-configure.patch
new file mode 100644
index 0000000..52b5e74
--- /dev/null
+++ b/patches/libbytesize-autogen-configure.patch
@@ -0,0 +1,17 @@
+diff --git a/autogen.sh b/autogen.sh
+index 0fa7f21..b73357a 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -15,3 +15,12 @@ aclocal --install || exit 1
+ autoreconf --verbose --force --install -Wno-portability || exit 1
+ rm -rf autom4te.cache
+ popd
++if [ "$NOCONFIGURE" = "" ]; then
++        $srcdir/configure "$@" || exit 1
++
++        if [ "$1" = "--help" ]; then exit 0 else
++                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
++        fi
++else
++        echo "Skipping configure process."
++fi