--- meson.build.orig 2020-11-28 02:38:31 UTC
+++ meson.build
@@ -212,19 +212,19 @@ else
conf.set_quoted('FC_DEFAULT_FONTS', '
/System/Library/Fonts /Library/Fonts ~/Library/Fonts /System/Library/Assets/com_apple_MobileAsset_Font3 /System/Library/Assets/com_apple_MobileAsset_Font4')
fonts_conf.set('FC_DEFAULT_FONTS', '/System/Library/Fonts /Library/Fonts ~/Library/Fonts /System/Library/Assets/com_apple_MobileAsset_Font3 /System/Library/Assets/com_apple_MobileAsset_Font4')
else
- conf.set_quoted('FC_DEFAULT_FONTS', '/usr/share/fonts')
- fonts_conf.set('FC_DEFAULT_FONTS', '/usr/share/fonts')
+ conf.set_quoted('FC_DEFAULT_FONTS', '%%FCDEFAULTFONTS%% %%FCADDFONTS%%')
+ fonts_conf.set('FC_DEFAULT_FONTS', '%%FCDEFAULTFONTS%% %%FCADDFONTS%%')
endif
- fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name())
+ fc_cachedir = '/var/db/fontconfig'
thread_dep = dependency('threads')
conf.set('HAVE_PTHREAD', 1)
deps += [thread_dep]
endif
-fc_templatedir = join_paths(prefix, get_option('datadir'), 'fontconfig/conf.avail')
+fc_templatedir = join_paths(prefix, get_option('sysconfdir'), 'fonts/conf.avail')
fc_baseconfigdir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
fc_configdir = join_paths(fc_baseconfigdir, 'conf.d')
-fc_xmldir = join_paths(prefix, get_option('datadir'), 'xml/fontconfig')
+fc_xmldir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
conf.set_quoted('CONFIGDIR', fc_configdir)
@@ -361,7 +361,7 @@ configure_file(output: 'fonts.conf',
install: true)
install_data('fonts.dtd',
- install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xml/fontconfig')
+ install_dir: join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts')
)
fc_headers = [