[gtk-osx] Restore the additonal fonts paths to fontconfig.

[John Ralls <jralls src gnome org>]

commit 93eed84a17dd5c98b410ba4e65a4f02c2fc2248f
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 27 13:53:53 2020 -0700

    Restore the additonal fonts paths to fontconfig.
    
    Also change the default to /System/Library/Fonts/Supplemental as that's
    where most of the commonly-used fonts live. There aren't many at all
    in /Libary/Fonts.
    
    Returns the unstable build to autotools because meson doesn't have this
    option.

 modulesets-stable/gtk-osx.modules   | 2 +-
 modulesets-unstable/gtk-osx.modules | 5 +++--
 modulesets/gtk-osx.modules          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 59fa90d..f723dad 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -144,7 +144,7 @@ configurations of WebKit.
   </cmake>
 
   <autotools id="fontconfig" autogen-sh="configure"
-             autogenargs="--disable-docs">
+             autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts --with-cache-dir=home">
     <branch repo="fontconfig" version="2.13.1"
             module="fontconfig-2.13.1.tar.bz2"/>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index b36c989..17f0d38 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -119,12 +119,13 @@
     </dependencies>
   </cmake>
 
-  <meson id="fontconfig" mesonargs="-Ddocs=disabled">
+  <autotools id="fontconfig" autogen-sh="configure"
+             autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts --with-cache-dir=home">
     <branch repo="freedesktop" module="fontconfig/fontconfig"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
     <branch repo="freedesktop" module="pixman/pixman" />
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index f0ed5ea..f0bbd27 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -118,7 +118,7 @@
   </cmake>
 
   <autotools id="fontconfig" autogen-sh="configure"
-             autogenargs="--disable-docs">
+             autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts --with-cache-dir=home">
     <branch repo="freedesktop" module="fontconfig/fontconfig" tag="2.13.1"/>
     <dependencies>
       <dep package="freetype"/>