[jhbuild] 3.26: Add simple-scan

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 37ee388eda9323a8ceec70c58660673f96f6d096
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Apr 27 10:34:13 2017 -0500

    3.26: Add simple-scan
    
    Requires adding SANE and configuring colord with vala support

 modulesets/gnome-suites-core-3.26.modules      |   21 +++++++++++++++++++++
 modulesets/gnome-suites-core-deps-3.26.modules |    5 +++--
 modulesets/gnome-sysdeps-3.26.modules          |    5 +++++
 3 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 146c125..a82c6e3 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -1101,6 +1101,25 @@
     </suggests>
   </autotools>
 
+  <meson id="simple-scan">
+    <branch/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="itstool"/>
+      <dep package="libgusb"/>
+      <dep package="sane"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
+    </dependencies>
+    <suggests>
+      <dep package="PackageKit"/>
+      <dep package="colord-gtk"/>
+    </suggests>
+  </meson>
+
   <autotools id="sushi">
     <branch/>
     <dependencies>
@@ -1301,6 +1320,8 @@
       <dep package="totem"/>
       <dep package="yelp"/>
       <if condition-set="linux">
+        <!-- libgusb dependency -->
+        <dep package="simple-scan"/>
         <!-- udisks dependency -->
         <dep package="gnome-disk-utility"/>
         <!-- udev dependency -->
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index d781303..4ea4a83 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -252,7 +252,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion 
--with-systemdsystemunitdir=no">
+  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion 
--with-systemdsystemunitdir=no --enable-vala">
     <if condition-unset="linux">
       <autogenargs value="--disable-gusb --disable-udev --disable-systemd-login"/>
     </if>
@@ -265,6 +265,7 @@
       <dep package="lcms2"/>
       <dep package="gobject-introspection"/>
       <dep package="docbook-xml"/>
+      <dep package="vala"/>
       <!-- and cups -->
       <!-- and sane -->
       <if condition-set="linux">
@@ -281,7 +282,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="colord-gtk">
+  <autotools id="colord-gtk" autogenargs="--enable-vala">
     <branch repo="github.com" checkoutdir="colord-gtk" module="hughsie/colord-gtk.git"/>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index 4b44c78..8b8cb13 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -1033,6 +1033,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="sane">
+    <pkg-config>sane-backends.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="sbc">
     <pkg-config>sbc.pc</pkg-config>
     <branch repo="system"