[jhbuild] 3.28: Rework conditions of dependencies and enable OpenGL for cairo

[Ting-Wei Lan <lantw src gnome org>]

commit 7da373b7f43402e657d04d59e04994247bf818ba
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Feb 27 00:00:45 2018 +0800

    3.28: Rework conditions of dependencies and enable OpenGL for cairo
    
    There were many dependencies put in the linux condition block, which was
    wrong because these libraries are portable and not specific to features
    in Linux kernel. X11 libraries are now put in the x11 condition block,
    and things that are only useful on free operating systems are put in
    the quartz unset condition block.
    
    The use of quartz unset condition here is not precise. What we really
    need is a way to enable them on free desktop environments, but at least
    it works and it is what the old modulesets use.
    
    WebKit needs the OpenGL backend of cairo. We have to enable it because
    it is not enabled by default. I don't know whether the OpenGL backend
    works on macOS. The only thing I know is that the bug report referenced
    by the old modulesets is still not resolved.

 modulesets/gnome-suites-core-deps-3.28.modules |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index a8a02dd..78f1d94 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -131,13 +131,18 @@ the module and we will just change it to use a tarball anyway.
     </branch>
   </cmake>
 
-  <autotools id="cairo">
+  <autotools id="cairo" autogenargs="--enable-gl">
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz --disable-gl"/>
+    </if>
     <branch repo="git.freedesktop.org" module="cairo"/>
     <dependencies>
-      <if condition-set="linux">
+      <if condition-unset="quartz">
         <dep package="fontconfig"/>
         <dep package="freetype2"/>
         <dep package="gl"/>
+      </if>
+      <if condition-set="x11">
         <dep package="libXext"/>
         <dep package="libXrender"/>
         <dep package="x11"/>