[jhbuild] 3.26: Add tracker-miners

[Carlos Garnacho <carlosg src gnome org>]

commit 1758316d8a702e5a433544d8de99c8ecf1ebe4f8
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Aug 3 18:38:59 2017 +0200

    3.26: Add tracker-miners
    
    Tracker is being split into miners/core, so add this
    new repo all along the chain. This dependency has been
    added to final consumers of miner data, libraries like
    grilo or rygel are just consumers of the RDF capability
    storage, with no special prediletion for miner data, so
    haven't been added the dependency.
    
    Also, a bunch of autogen arguments are now needless on
    tracker package, so those have been dropped too.

 modulesets/gnome-suites-core-3.26.modules      |    5 ++++
 modulesets/gnome-suites-core-deps-3.26.modules |   27 +++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 53372c4..05cd590 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -756,6 +756,7 @@
       <dep package="spice-gtk"/>
       <dep package="vala"/>
       <dep package="tracker"/>
+      <dep package="tracker-miners"/>
       <if condition-set="linux">
         <dep package="gudev"/>
       </if>
@@ -859,6 +860,7 @@
       <dep package="gtk+-3"/>
       <dep package="gnome-desktop"/>
       <dep package="tracker"/>
+      <dep package="tracker-miners"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-online-miners"/>
       <dep package="libgdata"/>
@@ -949,6 +951,7 @@
       <dep package="libmediaart"/>
       <dep package="pygobject"/>
       <dep package="tracker"/>
+      <dep package="tracker-miners"/>
     </dependencies>
   </autotools>
 
@@ -974,6 +977,7 @@
       <dep package="libjpeg"/>
       <dep package="libpng"/>
       <dep package="tracker"/>
+      <dep package="tracker-miners"/>
     </dependencies>
   </autotools>
 
@@ -1087,6 +1091,7 @@
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="tracker"/>
+      <dep package="tracker-miners"/>
       <dep package="exempi"/>
       <dep package="libexif"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index f1a3a92..1e01da9 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -1776,23 +1776,37 @@
     </suggests>
   </meson>
 
-  <!-- evolution miner broken:
-       https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
   <autotools id="tracker"
-             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu 
--with-bash-completion-dir=${prefix}/share/bash-completion/completions"
+             autogenargs="--with-unicode-support=libicu 
--with-bash-completion-dir=${prefix}/share/bash-completion/completions"
              check-target="false"
              supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="json-glib"/>
-      <dep package="libgrss"/>
       <dep package="libicu"/>
-      <dep package="libmediaart"/>
-      <dep package="libpng"/>
       <dep package="libuuid"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="upower"/>
+      <dep package="dconf"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
+    </suggests>
+  </autotools>
+
+  <autotools id="tracker-miners"
+             check-target="false"
+             supports-non-srcdir-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="tracker"/>
+      <dep package="libpng"/>
+      <dep package="libgrss"/>
       <if condition-set="linux">
         <dep package="libseccomp"/>
       </if>
@@ -1801,7 +1815,6 @@
       <dep package="libsecret"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="upower"/>
       <dep package="libgsf"/>
       <dep package="gdk-pixbuf"/>
       <dep package="poppler"/>