[jhbuild] modules: Change some things for macos condition

[Philip Chimento <pchimento src gnome org>]

commit 658a7736b2a69b35d157ae57fdd3d4bcd57d8f5f
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 3 22:17:08 2016 -0700

    modules: Change some things for macos condition
    
    - GLib uses internal pcre to avoid a system dependency
    - We build shared-mime-info, and it depends on GLib, so GLib can't go
      after it
    - PackageKit and upower don't have macOS backends
    - Tools for building Glade and libsecret manpages are not present
    - CA certificates are accessed through Keychain on macOS, so there is no
      path to pass to glib-networking's and librest's --with-ca-certificates
    - Drop p11-glue dependency where optional; it occasionally causes
      hard-to-track-down problems
    - No ALSA on macOS
    - No Avahi on macOS - this also requires disabling geoclue's NMEA source
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774453

 modulesets/gnome-apps-3.22.modules             |    3 +++
 modulesets/gnome-apps-3.24.modules             |    3 +++
 modulesets/gnome-suites-core-3.22.modules      |   22 +++++++++++++++++-----
 modulesets/gnome-suites-core-3.24.modules      |   22 +++++++++++++++++-----
 modulesets/gnome-suites-core-deps-3.22.modules |   20 ++++++++++++++++++--
 modulesets/gnome-suites-core-deps-3.24.modules |   20 ++++++++++++++++++--
 6 files changed, 76 insertions(+), 14 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.22.modules b/modulesets/gnome-apps-3.22.modules
index 5c03b6f..50b8aeb 100644
--- a/modulesets/gnome-apps-3.22.modules
+++ b/modulesets/gnome-apps-3.22.modules
@@ -365,6 +365,9 @@
   </autotools>
 
   <autotools id="glade">
+    <if condition-set="macos">
+      <autogenargs value="--disable-man-pages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-apps-3.24.modules b/modulesets/gnome-apps-3.24.modules
index ac26188..c7420ef 100644
--- a/modulesets/gnome-apps-3.24.modules
+++ b/modulesets/gnome-apps-3.24.modules
@@ -392,6 +392,9 @@
   </autotools>
 
   <autotools id="glade">
+    <if condition-set="macos">
+      <autogenargs value="--disable-man-pages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index 5b72ecc..3520e3e 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -117,6 +117,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-pkcs11 --without-ca-certificates"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -124,7 +127,9 @@
       <dep package="libproxy"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gnutls"/>
-      <dep package="p11-kit"/>
+      <if condition-unset="macos">
+        <dep package="p11-kit"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -539,10 +544,11 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-bluez4 --disable-bluez5"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--disable-alsa --disable-avahi"/>
+    </if>
     <branch repo="pulseaudio.freedesktop.org"/>
     <dependencies>
-      <dep package="alsa"/>
-      <dep package="avahi"/>
       <dep package="dbus"/>
       <dep package="json"/>
       <dep package="libsndfile"/>
@@ -558,6 +564,10 @@
       <if condition-set="systemd">
         <dep package="libsystemd"/>
       </if>
+      <if condition-unset="macos">
+        <dep package="alsa"/>
+        <dep package="avahi"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1393,13 +1403,15 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="PackageKit"/>
       <dep package="telepathy-glib"/>
-      <dep package="upower"/>
       <dep package="WebKit"/>
       <!-- and bindings -->
       <dep package="pygobject"/>
       <dep package="gtkmm"/>
+      <if condition-unset="macos">
+        <dep package="PackageKit"/>
+        <dep package="upower"/>
+      </if>
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index e9cc8b7..d7e8778 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -117,6 +117,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-pkcs11 --without-ca-certificates"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -124,7 +127,9 @@
       <dep package="libproxy"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gnutls"/>
-      <dep package="p11-kit"/>
+      <if condition-unset="macos">
+        <dep package="p11-kit"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -539,10 +544,11 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-bluez4 --disable-bluez5"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--disable-alsa --disable-avahi"/>
+    </if>
     <branch repo="pulseaudio.freedesktop.org"/>
     <dependencies>
-      <dep package="alsa"/>
-      <dep package="avahi"/>
       <dep package="dbus"/>
       <dep package="json"/>
       <dep package="libsndfile"/>
@@ -558,6 +564,10 @@
       <if condition-set="systemd">
         <dep package="libsystemd"/>
       </if>
+      <if condition-unset="macos">
+        <dep package="alsa"/>
+        <dep package="avahi"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1403,9 +1413,7 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="PackageKit"/>
       <dep package="telepathy-glib"/>
-      <dep package="upower"/>
       <dep package="WebKit"/>
       <!-- and bindings -->
       <dep package="pygobject"/>
@@ -1414,6 +1422,10 @@
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
+      <if condition-unset="macos">
+        <dep package="PackageKit"/>
+        <dep package="upower"/>
+      </if>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index aaacbc5..6334ada 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -424,6 +424,9 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--disable-nmea-source"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -468,16 +471,23 @@
     <if condition-set="freebsd">
       <autogenargs value="--disable-dtrace --with-libiconv=gnu"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--with-pcre=internal"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gettext"/>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
-      <dep package="libpcre"/>
       <dep package="zlib"/>
+      <if condition-unset="macos">
+        <dep package="libpcre"/>
+      </if>
     </dependencies>
     <after>
-      <dep package="shared-mime-info"/>
+      <if condition-unset="macos">
+        <dep package="shared-mime-info"/>
+      </if>
     </after>
   </autotools>
 
@@ -1266,6 +1276,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-ca-certificates"/>
+    </if>
     <branch revision="librest-0-7"/>
     <dependencies>
       <dep package="glib"/>
@@ -1292,6 +1305,9 @@
   </autotools>
 
   <autotools id="libsecret">
+    <if condition-set="macos">
+      <autogenargs value="--disable-manpages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index e4c1f62..7cc5ff4 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -440,6 +440,9 @@
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--disable-nmea-source"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -484,16 +487,23 @@
     <if condition-set="freebsd">
       <autogenargs value="--disable-dtrace --with-libiconv=gnu"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--with-pcre=internal"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="gettext"/>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
-      <dep package="libpcre"/>
       <dep package="zlib"/>
+      <if condition-unset="macos">
+        <dep package="libpcre"/>
+      </if>
     </dependencies>
     <after>
-      <dep package="shared-mime-info"/>
+      <if condition-unset="macos">
+        <dep package="shared-mime-info"/>
+      </if>
     </after>
   </autotools>
 
@@ -1391,6 +1401,9 @@
     <if condition-set="freebsd">
       <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
     </if>
+    <if condition-set="macos">
+      <autogenargs value="--without-ca-certificates"/>
+    </if>
     <branch revision="librest-0-7"/>
     <dependencies>
       <dep package="glib"/>
@@ -1417,6 +1430,9 @@
   </autotools>
 
   <autotools id="libsecret">
+    <if condition-set="macos">
+      <autogenargs value="--disable-manpages"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>