[gtk-osx] Accommodate certain libraries changing their primary branch to 'main'.

[John Ralls <jralls src gnome org>]

commit a3beb2a6ce1e71875bd7e4bd39981bc9d757e4ce
Author: John Ralls <jralls ceridwen us>
Date:   Sat Oct 9 11:20:38 2021 -0700

    Accommodate certain libraries changing their primary branch to 'main'.

 modulesets-unstable/gtk-osx.modules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index d22923fb..a3bf9628 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -70,7 +70,7 @@
   </autotools>
   
   <meson id="glib" mesonargs="-Dlibmount=disabled">
-    <branch/>
+    <branch revision='main'/>
     <dependencies>
       <dep package="libpcre"/>
       <dep package="libffi"/>
@@ -89,7 +89,7 @@
   </cmake>
 
   <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
-    <branch repo="github" module="harfbuzz/harfbuzz"/>
+    <branch revision="main" repo="github" module="harfbuzz/harfbuzz"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="freetype-no-harfbuzz"/>
@@ -110,13 +110,13 @@
 
   <autotools id="fontconfig"
              autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts --with-cache-dir=home">
-    <branch repo="freedesktop" module="fontconfig/fontconfig"/>
+    <branch revision="main" repo="freedesktop" module="fontconfig/fontconfig"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
+  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx --disable-arm-a64-neon">
     <branch repo="freedesktop" module="pixman/pixman" />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -153,7 +153,7 @@
        to use introspection it requires harfbuzz to have
        introspection, and gobject-introspection needs cairo. -->
   <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
-    <branch repo="github" module="harfbuzz/harfbuzz"/>
+    <branch revision="main" repo="github" module="harfbuzz/harfbuzz"/>
     <dependencies>
       <dep package="gobject-introspection"/>
       <dep package="cairo"/>