[gtk-osx] Remove meta-gtk-osx-freetype, make modules part of core metamodules.

[John Ralls <jralls src gnome org>]

commit ca43dd0ea7ccd01f77523dfde7305a25df6e61b7
Author: John Ralls <jralls ceridwen us>
Date:   Fri Sep 11 13:09:03 2020 -0700

    Remove meta-gtk-osx-freetype, make modules part of core metamodules.
    
    The basic problem is two circular dependencies in the text handling
    modules:
    1. freetype2 depends on harfbuzz and harfbuzz depends on freetype2.
    2. harbuzz depends on gobject-introspection which depends on cairo which
    depends on harfbuzz.
    
    One more little detail: If pango detects freetype it insists on
    fontconfig as well, and fontconfig needs the freetype built with
    harfbuzz. Both of those need to be built before cairo because pango
    wants the cairoft2 and cairofc. In that case pango also demands harfbuzz
    with freetype2 support and with gobject introspection.
    
    librsvg, required for icon rendering, requires freetype2 but doesn't
    need any of the others.
    
    It proved unreasonably complex to have meta-gtk-osx-freetype as an
    optional module so remove it (a stub remains to prevent breaking
    modulesets that use it).

 jhbuildrc-gtk-osx                             | 19 ++++++--
 modulesets-stable/gtk-osx-bootstrap.modules   | 25 ----------
 modulesets-stable/gtk-osx-network.modules     |  3 --
 modulesets-stable/gtk-osx.modules             | 67 ++++++++++++++++++---------
 modulesets-unstable/gtk-osx-bootstrap.modules | 22 ---------
 modulesets-unstable/gtk-osx-network.modules   |  3 --
 modulesets-unstable/gtk-osx.modules           | 41 +++++++++++-----
 modulesets/gtk-osx-bootstrap.modules          | 23 ---------
 modulesets/gtk-osx-network.modules            |  3 --
 modulesets/gtk-osx.modules                    | 48 +++++++++++++------
 10 files changed, 123 insertions(+), 131 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 22edd99..c76d6b1 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -482,6 +482,21 @@ disable_Werror = False
 # custom autogen-templates Gtk-OSX needs to use:"
 nice_build = False
 
+# Harfbuzz needs to be built twice, once before cairo and again after
+# gobject-introspection because cairo needs harfbuzz and
+# gobject-introspection needs cairo. The only way to get jhbuild to
+# run the configuration for harfbuzz the second time is to set
+# always_autogen to true.
+
+always_autogen = True
+
+# Freetype2 if left to itself will create an install name without the
+# path so none of the libraries that depend on it can link. Require
+# the install name to be an absolute path.
+
+module_cmakeargs["freetype"] = '-DCMAKE_INSTALL_NAME_DIR="' + os.path.join(prefix, 'lib') + '"'
+
+
 # Check and warn if jhbuild is started from within jhbuild, since that
 # will mess up environment variables, especially if different build
 # setups are used.
@@ -565,10 +580,6 @@ if 'XML_CATALOG_FILES' in os.environ:
 else:
     os.environ['XML_CATALOG_FILES'] = _pfx_cat_file
 
-#Freetype has -ansi added by its configure, but uses c99 code
-#
-append_autogenargs("freetype", 'CFLAGS="$CFLAGS -std=c99"')
-
 #GConf needs to be built static, overriding the generic autogenargs,
 #but including it in the module puts it in front of where autogenargs
 #puts --disable-static, so we need the override here.
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 86d8c89..5a5bc34 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -135,23 +135,6 @@
             hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
   </autotools>
 
-  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D 
CMAKE_BUILD_TYPE=Release">
-    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
-            repo="sourceforge"/>
-    <dependencies>
-      <dep package="zlib"/>
-    </dependencies>
-  </cmake>
-
-  <autotools id="fontconfig" autogen-sh="configure"
-             autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.13.1"
-            module="fontconfig-2.13.1.tar.bz2"/>
-    <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="hicolor-icon-theme" autogen-sh="configure"
             supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.15.tar.xz" repo="icon-theme"
@@ -168,12 +151,4 @@
     </dependencies>
   </metamodule>
 
-  <!-- Use this only if you need fontconfig and for freetype to have harfbuzz shaping available. -->
-  <metamodule id="meta-gtk-osx-freetype">
-    <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </metamodule>
-
 </moduleset>
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index e0410e9..1974a09 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -160,7 +160,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk"/>
@@ -184,7 +183,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -223,7 +221,6 @@
       <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="libgcrypt"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 238d605..fe73b38 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -105,16 +105,38 @@ configurations of WebKit.
     </dependencies>
   </meson>
 
-  <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE 
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
-    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
-            repo="sourceforge">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/freetype-install-name.patch"; 
strip="1"/>
+  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
+    <branch repo="github-tarball" version="2.7.1"
+            module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz" 
+            hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
     </branch>
     <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+    <after>
+      <dep package="icu"/>
+      <dep package="icu55"/>
+    </after>
+  </meson>
+
+  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D 
CMAKE_BUILD_TYPE=Release">
+    <branch module="freetype/freetype-2.10.2.tar.gz" version="2.10.2"
+            repo="sourceforge"/>
+    <dependencies>
+      <dep package="harfbuzz-no-cairo"/>
       <dep package="zlib"/>
     </dependencies>
   </cmake>
 
+  <autotools id="fontconfig" autogen-sh="configure"
+             autogenargs="--disable-docs">
+    <branch repo="fontconfig" version="2.13.1"
+            module="fontconfig-2.13.1.tar.bz2"/>
+    <dependencies>
+      <dep package="freetype"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx"
              autogen-sh="configure">
     <branch version="0.40.0" module="pixman-0.40.0.tar.gz"
@@ -137,11 +159,9 @@ configurations of WebKit.
     <dependencies>
       <dep package="pixman"/>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="freetype-no-harfbuzz"/>
-    </dependencies>
-    <after>
+      <dep package="harfbuzz-no-cairo"/>
       <dep package="fontconfig"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <meson id="gobject-introspection">
@@ -159,26 +179,24 @@ configurations of WebKit.
     </after>
   </meson>
 
-  <meson id="fribidi" mesonargs="-Ddocs=false">
-    <branch module="fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz"
-            repo="github-tarball" version="1.0.9"/>
-    <dependencies>
-      <!--dep package="c2man"/ -->
-    </dependencies>
-  </meson>
-
   <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
     <branch repo="github-tarball" version="2.7.1"
             module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz" 
             hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
     </branch>
     <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="gobject-introspection"/>
       <dep package="cairo"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </meson>
+
+  <meson id="fribidi" mesonargs="-Ddocs=false">
+    <branch module="fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz"
+            repo="github-tarball" version="1.0.9"/>
+    <dependencies>
+      <!--dep package="c2man"/ -->
     </dependencies>
-    <after>
-      <dep package="gobject-introspection"/>
-    </after>
   </meson>
 
   <meson id="pango">
@@ -188,13 +206,12 @@ configurations of WebKit.
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fribidi"/>
       <dep package="harfbuzz"/>
+      <dep package="fribidi"/>
     </dependencies>
     <after>
       <dep package="gobject-introspection"/>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="freetype-no-harfbuzz"/>
     </after>
   </meson>
   
@@ -334,13 +351,14 @@ configurations of WebKit.
             hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
     <dependencies>
       <dep package="libcroco"/>
-      <dep package="freetype-no-harfbuzz"/>
     </dependencies>
     <after>
       <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
       <dep package="gtk+"/>
       <dep package="gtk+-3.0"/>
       <dep package="gtk+-3.14"/>
+      <dep package="freetype-no-harfbuzz"/>
+      <dep package="freetype"/>
     </after>
   </autotools>
 
@@ -352,4 +370,7 @@ configurations of WebKit.
     </dependencies>
   </autotools>
 
+  <!-- Null metamodule, provided so as not to break modules that use it. -->
+  <metamodule id="meta-gtk-osx-freetype" />
+
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 1c86595..15798e8 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -113,20 +113,6 @@
             hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
   </autotools>
 
-  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D 
CMAKE_BUILD_TYPE=Release">
-    <branch module="freetype/freetype2" repo="nongnu"/>
-    <dependencies>
-      <dep package="harfbuzz"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </cmake>
-
-  <meson id="fontconfig" mesonargs="-Ddocs=disabled">
-    <branch repo="freedesktop" module="fontconfig/fontconfig"/>
-    <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
-    </dependencies>
-  </meson>
 
   <autotools id="hicolor-icon-theme" autogen-sh="configure" supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.13.tar.gz" repo="icon-theme"
@@ -153,12 +139,4 @@
     </dependencies>
   </metamodule>
 
-  <!-- Use this only if you need fontconfig and for freetype to have harfbuzz shaping available. -->
-  <metamodule id="meta-gtk-osx-freetype">
-    <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </metamodule>
-
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 9ec718d..c4e18c9 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -161,7 +161,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk"/>
@@ -184,7 +183,6 @@
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -230,7 +228,6 @@
       <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="libgcrypt"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 65ad7fc..4bfe654 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -88,13 +88,29 @@
     </dependencies>
   </meson>
 
-   <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE 
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
+  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
+    <branch repo="github" module="harfbuzz/harfbuzz"/>
+    <after>
+      <dep package="icu"/>
+      <dep package="icu55"/>
+    </after>
+  </meson>
+  
+  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=TRUE -D 
CMAKE_BUILD_TYPE=Release">
     <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
+      <dep package="harfbuzz-no-cairo"/>
       <dep package="zlib"/>
     </dependencies>
   </cmake>
 
+  <meson id="fontconfig" mesonargs="-Ddocs=disabled">
+    <branch repo="freedesktop" module="fontconfig/fontconfig"/>
+    <dependencies>
+      <dep package="freetype"/>
+    </dependencies>
+  </meson>
+
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
     <branch repo="freedesktop" module="pixman/pixman" />
     <after>
@@ -108,10 +124,9 @@
     <dependencies>
       <dep package="pixman"/>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="fontconfig"/>
     </dependencies>
     <after>
-      <dep package="fontconfig"/>
     </after>
   </autotools>
 
@@ -120,19 +135,19 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package='python3'/>
     </dependencies>
+    <after>
+      <dep package='python3'/>
+    </after>
   </meson>
 
-  <meson id="harfbuzz" mesonargs="-Ddocs=disabled">
+  <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
     <branch repo="github" module="harfbuzz/harfbuzz"/>
     <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="gobject-introspection"/>
       <dep package="cairo"/>
+      <dep package="fontconfig"/>
     </dependencies>
-    <after>
-      <dep package="gobject-introspection"/>
-    </after>
   </meson>
 
   <meson id="fribidi" mesonargs="-Ddocs=false">
@@ -147,12 +162,11 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fribidi"/>
       <dep package="harfbuzz"/>
+      <dep package="fribidi"/>
     </dependencies>
     <after>
       <dep package="gobject-introspection"/>
-      <dep package="freetype-no-harfbuzz"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </meson>
@@ -262,7 +276,7 @@
     <branch module="librsvg" tag="librsvg-2-40"/>
     <dependencies>
       <dep package="libcroco"/>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="freetype"/>
     </dependencies>
     <after>
       <dep package="gtk+"/>
@@ -277,4 +291,7 @@
     </dependencies>
   </autotools>
 
+  <!-- Null metamodule, provided so as not to break modules that use it. -->
+  <metamodule id="meta-gtk-osx-freetype" />
+
 </moduleset>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 40d2240..07b4073 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -120,22 +120,6 @@
             hash="sha256:52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"/>
   </autotools>
 
-  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D 
CMAKE_BUILD_TYPE=Release">
-    <branch module="freetype/freetype2" repo="nongnu"/>
-    <dependencies>
-      <dep package="harfbuzz"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </cmake>
-
-  <autotools id="fontconfig" autogen-sh="configure"
-             autogenargs="--disable-docs">
-    <branch repo="freedesktop" module="fontconfig/fontconfig" tag="2.13.1"/>
-    <dependencies>
-      <dep package="freetype"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="hicolor-icon-theme" autogen-sh="configure"
             supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.15.tar.xz" repo="icon-theme"
@@ -152,11 +136,4 @@
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-freetype">
-    <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </metamodule>
-
 </moduleset>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 0c75cbe..9d04515 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -165,7 +165,6 @@
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk"/>
@@ -188,7 +187,6 @@
       <dep package="enchant"/>
       <dep package="icu55"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -223,7 +221,6 @@
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 297b4fe..22bf54f 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -86,30 +86,49 @@
     </dependencies>
   </meson>
 
-  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
-    <branch repo="freedesktop" module="pixman" revision="0.38"/>
+  <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
+    <branch repo="github" module="harfbuzz/harfbuzz" tag="2.7.1"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="icu"/>
+      <dep package="icu55"/>
     </after>
-  </autotools>
+  </meson>
 
-  <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE 
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
-    <branch module="freetype/freetype2" repo="nongnu" tag="VER-2-10-2"/>
+  <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D 
CMAKE_BUILD_TYPE=Release">
+    <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
+      <dep package="harfbuzz-no-cairo"/>
       <dep package="zlib"/>
     </dependencies>
   </cmake>
 
+  <autotools id="fontconfig" autogen-sh="configure"
+             autogenargs="--disable-docs">
+    <branch repo="freedesktop" module="fontconfig/fontconfig" tag="2.13.1"/>
+    <dependencies>
+      <dep package="freetype"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
+    <branch repo="freedesktop" module="pixman" revision="0.38"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </autotools>
+
   <autotools id="cairo"
              autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
     <branch repo="freedesktop" module="cairo" revision="1.16"/>
     <dependencies>
       <dep package="pixman"/>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="fontconfig"/>
     </dependencies>
     <after>
-      <dep package="fontconfig"/>
     </after>
   </autotools>
 
@@ -124,12 +143,12 @@
     </after>
   </meson>
 
-  <meson id="harfbuzz" mesonargs=""-Dcoretext=enabled -Ddocs=disabled">
+  <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled">
     <branch repo="github" module="harfbuzz/harfbuzz" tag="2.7.1"/>
     <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
       <dep package="gobject-introspection"/>
       <dep package="cairo"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </meson>
 
@@ -145,12 +164,11 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fribidi"/>
       <dep package="harfbuzz"/>
+      <dep package="fribidi"/>
     </dependencies>
     <after>
       <dep package="gobject-introspection"/>
-      <dep package="freetype-no-harfbuzz"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </meson>
@@ -243,12 +261,13 @@
     <branch module="librsvg" tag="librsvg-2-40"/>
     <dependencies>
       <dep package="libcroco"/>
-      <dep package="freetype-no-harfbuzz"/>
     </dependencies>
     <after>
 <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
       <dep package="gtk+"/>
       <dep package="gtk+-3.0"/>
+      <dep package="freetype-no-harfbuzz"/>
+      <dep package="freetype"/>
     </after>
   </autotools>
 
@@ -256,4 +275,7 @@
     <branch/>
   </autotools>
 
+  <!-- Null metamodule, provided so as not to break modules that use it. -->
+  <metamodule id="meta-gtk-osx-freetype" />
+
 </moduleset>