[gtk-osx: 6/6] mesonargs changes for gtk+-3.0 and gdk-pixbuf.

[John Ralls <jralls src gnome org>]

commit 207bc75401d03c365d2dfcdb1e9bc3ca1dc651cb
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 7 09:31:14 2021 -0800

    mesonargs changes for gtk+-3.0 and gdk-pixbuf.

 modulesets-stable/gtk-osx.modules   | 5 ++---
 modulesets-unstable/gtk-osx.modules | 5 ++---
 modulesets/gtk-osx.modules          | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 27970cb5..8ca7f35f 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -233,7 +233,7 @@
     </after>
   </meson>
 
-  <meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
+  <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
     <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz" version="2.42.4"
             hash="sha256:fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d">
       <patch file="gdk-pixbuf-loader-name.patch" strip="1"/>
@@ -294,8 +294,7 @@
   </meson>
 
   <!-- gtk3 is in maintenance mode with 3.24 the final release series. -->
-  <meson id="gtk+-3.0"
-             mesonargs="-Dquartz-backend=true -Dx11-backend=false -Dmedia=none">
+  <meson id="gtk+-3.0">
     <branch module="gtk+/3.24/gtk+-3.24.30.tar.xz" version="3.24.30"
             hash="sha256:ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9">
       <patch file="Quartz-version-detection-for-macOS-12.patch" strip="1"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index d10f65f4..a214eca5 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -193,7 +193,7 @@
     </after>
  </meson>
 
-  <meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
+  <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
     <branch />
     <after>
       <dep package="pango"/>
@@ -225,8 +225,7 @@
             repo="hicolor"/>
   </autotools>
 
-  <meson id="gtk+-3.0"
-        mesonargs="-Dquartz-backend=true -Dx11-backend=false -Dmedia=none">
+  <meson id="gtk+-3.0">
     <branch module="gtk" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 8f70c0c4..7712ff2b 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -187,7 +187,7 @@
     </after>
   </meson>
 
-  <meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
+  <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
     <!--gdk-pixbuf is releasing from master-->
     <branch tag="2.42.4"/>
     <dependencies>
@@ -213,8 +213,7 @@
             repo="hicolor"/>
   </autotools>
 
-  <autotools id="gtk+-3.0"
-         autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
+  <autotools id="gtk+-3.0">
     <branch module="gtk" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
     <dependencies>
       <dep package="glib"/>