[gtk-osx: 12/48] Set -Dx11=false on gdk-pixbuf in modulesets-stable and modulesets.

[John Ralls <jralls src gnome org>]

commit a9124adb9d66d8be247d678433cd1020a13c965c
Author: John Ralls <jralls ceridwen us>
Date:   Fri Nov 9 13:08:37 2018 +0900

    Set -Dx11=false on gdk-pixbuf in modulesets-stable and modulesets.
    
    Echoing modulesets-unstable.

 modulesets-stable/gtk-osx-bootstrap.modules | 4 ++--
 modulesets-stable/gtk-osx.modules           | 2 +-
 modulesets/gtk-osx-bootstrap.modules        | 4 ++--
 modulesets/gtk-osx.modules                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 5b469a2..728b14d 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -117,7 +117,7 @@
     </dependencies>
   </autotools>
 
-  <meson id="gtk-doc">
+  <autotools id="gtk-doc">
     <branch version="1.29" module="gtk-doc/1.29/gtk-doc-1.29.tar.xz"
             hash="sha256:14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"/>
     <dependencies>
@@ -125,7 +125,7 @@
       <dep package="itstool"/>
       <dep package="python3"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index a49bfa6..40146e8 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -153,7 +153,7 @@
     </after>
   </meson>
 
-  <meson id="gdk-pixbuf">
+  <meson id="gdk-pixbuf" mesonargs="-Dx11=false">
     <branch module="gdk-pixbuf/2.38/gdk-pixbuf-2.38.0.tar.xz" version="2.38.0"
             hash="sha256:dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47"/>
     <after>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 71a6c9c..9256d59 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -111,14 +111,14 @@
     </dependencies>
   </autotools>
 
-  <meson id="gtk-doc">
+  <autotools id="gtk-doc">
     <branch repo="git.gnome.org" version="1.29" tag="GTK_DOC_1_29"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
       <dep package="python3"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index c8dbd13..0e7f29f 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -121,7 +121,7 @@
     </after>
   </meson>
 
-  <meson id="gdk-pixbuf">
+  <meson id="gdk-pixbuf" mesonargs="-Dx11=false">
     <!--gdk-pixbuf is releasing from master-->
     <branch/>
     <dependencies>