[gtk-osx] Put modulesets-stable & modulesets fontconfig back to autotools.



commit b30dcfaa58a17243eb494d0f2482ed5eb4282906
Author: John Ralls <jralls ceridwen us>
Date:   Sat Aug 15 14:51:36 2020 -0700

    Put modulesets-stable & modulesets fontconfig back to autotools.
    
    meson build is git-master only.

 modulesets-stable/gtk-osx-bootstrap.modules | 5 +++--
 modulesets/gtk-osx-bootstrap.modules        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 0323a95..86d8c89 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -143,13 +143,14 @@
     </dependencies>
   </cmake>
 
-  <meson id="fontconfig" mesonargs="-Ddocs=disabled">
+  <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>
-  </meson>
+  </autotools>
 
   <autotools id="hicolor-icon-theme" autogen-sh="configure"
             supports-non-srcdir-builds="no">
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index c60516c..40d2240 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -128,12 +128,13 @@
     </dependencies>
   </cmake>
 
-  <meson id="fontconfig" mesonargs="-Ddocs=disabled">
+  <autotools id="fontconfig" autogen-sh="configure"
+             autogenargs="--disable-docs">
     <branch repo="freedesktop" module="fontconfig/fontconfig" tag="2.13.1"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <autotools id="hicolor-icon-theme" autogen-sh="configure"
             supports-non-srcdir-builds="no">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]