summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-30 16:34:23 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-08-13 17:10:14 -0400
commit945f245d988dce89720cf45221fbc5e7b2f952f3 (patch)
tree268a32301845f087f2308729b9b07aeeb54ed78e
parent7f4e26dacb4a4d964e9c6296789ac00fb60b9317 (diff)
downloadgtk+-945f245d988dce89720cf45221fbc5e7b2f952f3.tar.gz
build: We no longer need freetype
-rw-r--r--meson.build27
1 files changed, 0 insertions, 27 deletions
diff --git a/meson.build b/meson.build
index 6977fd95fd..f039710b4c 100644
--- a/meson.build
+++ b/meson.build
@@ -335,33 +335,6 @@ fribidi_dep = dependency('fribidi', version: fribidi_req,
require_pangoft2 = wayland_enabled or x11_enabled
pangoft_dep = dependency('pangoft2', required: false)
-if pangoft_dep.found()
- # Need at least 2.7.1 for FT_Get_Var_Design_Coordinates()
- # We get the dependency itself from pango, but pango doesn't care
- # about ft2 version, so an extra check is needed.
- ft2_dep = dependency('freetype2', version: '>= 2.7.1', required: require_pangoft2)
-
- # Fallback case: Look for the FreeType2 headers and library manually when its .pc
- # file is not available, such as on Visual Studio
- if not ft2_dep.found()
- ft2lib = ft2_dep
- if cc.has_header('ft2build.h')
- ft2_libnames = ['freetype', 'freetypemt']
- foreach lib: ft2_libnames
- if not ft2_dep.found()
- ft2lib = cc.find_library(lib)
- # If the FreeType2 library is found, check for FT_Get_Var_Design_Coordinates()
- if ft2lib.found()
- if cc.has_function('FT_Get_Var_Design_Coordinates', dependencies: ft2lib)
- ft2_dep = ft2lib
- endif
- endif
- endif
- endforeach
- endif
- endif
-endif
-
if require_pangoft2
pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
endif