[jhbuild/5101cb1c609b4077654b68d453d979acf3159958: 3/3] Custom adjustments

[Rico Tzschichholz <ricotz src gnome org>]

commit bafd975eb65fabf7ee379631f84ec03ed355cd65
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Apr 2 10:17:10 2017 +0200

    Custom adjustments

 modulesets/gnome-suites-core-3.26.modules      |    2 +-
 modulesets/gnome-suites-core-deps-3.26.modules |   27 +++++++++++++++++++++++-
 modulesets/gnome-sysdeps-3.26.modules          |    5 ----
 modulesets/gnome-world.modules                 |    8 +++---
 4 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 053c461..988644e 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -1210,7 +1210,7 @@
   </autotools>
 
   <autotools id="NetworkManager"
-             autogenargs="PYTHON=python3 --with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--with-crypto=gnutls --disable-more-warnings --disable-json-validation">
+             autogenargs="PYTHON=python3 --with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--with-crypto=gnutls --disable-more-warnings --disable-json-validation --without-nmcli">
     <branch repo="git.freedesktop.org"
                  module="NetworkManager/NetworkManager.git"
             checkoutdir="NetworkManager"/>
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 952e0e8..d59f437 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -77,6 +77,10 @@
 
 <!-- Please try to keep organized alphabetically -->
 
+  <cmake id="appstream">
+    <branch repo="github.com" module="ximion/appstream.git"/>
+  </cmake>
+
   <meson id="appstream-glib" mesonargs="-Denable-stemmer=false -Denable-rpm=false">
     <branch repo="github.com" module="hughsie/appstream-glib.git"/>
     <dependencies>
@@ -95,6 +99,23 @@
     </dependencies>
   </meson>
 
+  <autotools id="cairo" autogenargs="--enable-gl">
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz --disable-gl"/>
+    </if>
+    <branch repo="git.freedesktop.org">
+    </branch>
+    <dependencies>
+      <if condition-unset="quartz">
+        <dep package="fontconfig"/>
+        <dep package="gl"/>
+      </if>
+      <dep package="gtk-doc"/>
+      <dep package="librsvg"/>
+      <dep package="pixman"/>
+    </dependencies>
+  </autotools>
+
   <meson id="atk">
     <branch/>
     <dependencies>
@@ -1401,7 +1422,7 @@
     <if condition-unset="gnu-elf">
       <autogenargs value="--disable-Bsymbolic"/>
     </if>
-    <branch revision="librsvg-2-40"/>
+    <branch/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="glib"/>
@@ -1541,6 +1562,10 @@
     </dependencies>
   </distutils>
 
+  <cmake id="shaderc" cmakeargs="-DCMAKE_BUILD_TYPE=Release">
+    <branch repo="github.com" module="google/shaderc.git"/>
+  </cmake>
+
   <autotools id="mm-common">
     <branch/>
   </autotools>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index c4bf3e7..f9aec24 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -61,11 +61,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cairo">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch repo="system" version="1.14.0"/>
-  </systemmodule>
-
   <systemmodule id="caribou">
     <pkg-config>caribou-1.0.pc</pkg-config>
     <branch repo="system"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index e4353a5..f6f2f4f 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -343,7 +343,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gxml">
+  <autotools id="gxml" autogenargs="--disable-docs" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
@@ -661,7 +661,7 @@
 
   <autotools id="gst-libav"
              autogenargs="--disable-fatal-warnings">
-    <branch repo="gstreamer.freedesktop.org" revision="1.10"/>
+    <branch repo="gstreamer.freedesktop.org"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -3369,7 +3369,7 @@
   </autotools>
 
   <autotools id="libgda"
-             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
+             autogenargs="--with-java=no --disable-tools --enable-introspection --enable-gda-gi 
--enable-gdaui-gi --enable-vala --enable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
     </if>
@@ -3384,7 +3384,7 @@
   </autotools>
 
   <autotools id="libgda-5.2"
-             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --disable-vala 
--disable-gdaui-vala">
+             autogenargs="--with-java=no --disable-tools --enable-introspection --enable-gda-gi 
--enable-gdaui-gi --enable-vala --enable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
     </if>