[pango/for-main] Remove options from cairo subproject



commit daac10fd6ca8cbc415cee10d51a543eb648705f8
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Wed Feb 16 20:38:35 2022 +0000

    Remove options from cairo subproject
    
    Cairo is a proper meson project now, and force-enabling fontconfig and freetype broke the CI build on 
MacOS.

 meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 59a39434..fcff9ea7 100644
--- a/meson.build
+++ b/meson.build
@@ -445,8 +445,7 @@ endif
 # in a declarative way
 if not cairo_dep.found()
   cairo_dep = dependency('cairo', version: cairo_req_version,
-                         fallback: ['cairo', 'libcairo_dep'], required: get_option('cairo'),
-                         default_options: ['freetype=enabled', 'fontconfig=enabled'])
+                         fallback: ['cairo', 'libcairo_dep'], required: get_option('cairo'))
   cairo_found_type = cairo_dep.type_name()
 endif
 


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