[cantarell-fonts: 106/109] Remove now defunct fontconfigdir option
- From: Nikolaus Waxweiler <nwaxweiler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts: 106/109] Remove now defunct fontconfigdir option
- Date: Mon, 5 Feb 2018 21:20:33 +0000 (UTC)
commit 4e30a5716dbc77e13c6644f2dc9a497e7ecceeba
Author: Nikolaus Waxweiler <madigens gmail com>
Date: Sat Feb 3 01:06:55 2018 +0000
Remove now defunct fontconfigdir option
meson.build | 5 -----
meson_options.txt | 4 ----
2 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index acc8987..33c9985 100644
--- a/meson.build
+++ b/meson.build
@@ -7,11 +7,6 @@ if fontsdir == ''
fontsdir = join_paths(datadir, 'fonts', 'cantarell')
endif
-fontconfigdir = get_option('fontconfigdir')
-if fontconfigdir == ''
- fontconfigdir = join_paths(datadir, 'fontconfig', 'conf.avail')
-endif
-
python3 = import('python3').find_python()
fontmake = find_program('fontmake')
fontmake_wrapper = join_paths(meson.current_source_dir(), 'scripts', 'fm.py')
diff --git a/meson_options.txt b/meson_options.txt
index 759f2ee..a2c473d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,2 @@
option('fontsdir', type : 'string',
description : 'The directory the fonts should be copied to.')
-
-option('fontconfigdir', type : 'string',
- description : 'The directory where the fontconfig configuration files reside')
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]