summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-09-22 17:14:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-09-24 12:08:26 +0200
commite79f1261549d9c497a38ea1af8843a86883b02cd (patch)
tree408e9b52591659c531af3a44088049aeeddbffca /Repository.mk
parent57357260250a9f5ae59ea346db03f94f76cce42b (diff)
Compensate for loss of Type 1 "Standard Symbols L" substitute for "Symbol"
At least for me on Linux since LO 5.3, 'soffice sw/qa/extras/rtfexport/data/fdo72031.rtf' shows "Å" (rendered in "DejaVu Sans") instead of "⊕" (rendered in "Standard Symbols L"). That's presumably because 47ea13ef8dc8ab9aeded6121845e3ebd1d28b292 "Kill the old Unix layout engines" removed support for Type 1 fonts (see "Ignore Type 1 fonts" in FontCfgWrapper::addFontSet, vcl/unx/generic/fontmanager/fontconfig.cxx), and my (Fedora 25) /usr/share/fonts/default/Type1/s050000l.pfb "Standard Symbols L" is a Type 1 font. So we fell back to fontconfig's generic (weak) suggestion of "DejaVu Sans" as a substitute for "Symbol". So extend our fc_local.conf to suggest our "OpenSymbol" as a substitute for "Symbol". As that fc_local.conf was originally brought along by --with-fonts, which is enabled by default but can be disabled, compilation of fc_local.conf from the various snippets is moved to postprocess. macOS and Windows were never affected, as they both come with a "Symbol" font installed in the system. (And we don't install fc_local.conf on Windows at all.) Change-Id: I8d6d87f24974577fd66f5f3989f606237ebb3d75 Reviewed-on: https://gerrit.libreoffice.org/42670 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk
index 436e66ff6f50..268b4982018a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -942,6 +942,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
extras_fonts \
+ $(if $(filter-out WNT,$(OS)),postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
fonts_caladea \
fonts_carlito \
@@ -955,7 +956,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_ptserif \
fonts_sourcecode \
fonts_sourcesans \
- $(if $(filter-out WNT,$(OS)),more_fonts_conf) \
) \
))