diff options
Diffstat (limited to 'external/more_fonts')
-rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 1 | ||||
-rw-r--r-- | external/more_fonts/Package_conf.mk | 14 | ||||
-rw-r--r-- | external/more_fonts/fc_local.snippet (renamed from external/more_fonts/fonts/fc_local.conf) | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index eb2f3216c57a..6e5224752fe6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ - $(if $(filter-out WNT,$(OS)),Package_conf) \ ExternalPackage_caladea \ ExternalPackage_carlito \ ExternalPackage_dejavu \ diff --git a/external/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk deleted file mode 100644 index 2d259c2175c3..000000000000 --- a/external/more_fonts/Package_conf.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts)) - -$(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/fonts/fc_local.conf b/external/more_fonts/fc_local.snippet index 6af763c0b0f0..cb49929b0a4a 100644 --- a/external/more_fonts/fonts/fc_local.conf +++ b/external/more_fonts/fc_local.snippet @@ -1,7 +1,3 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd"> -<fontconfig> - <!-- Alias similar/metric-compatible families from various sources: --> <alias binding="same"> @@ -31,5 +27,3 @@ <family>Caladea</family> </accept> </alias> - -</fontconfig> |