diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-22 17:14:56 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-12-01 12:26:08 +0100 |
| commit | 011dc2d0ecfa022ab0df2d9081a2d68e62cfc3cf (patch) | |
| tree | 1fb0810f06806162ff615f550c7bf209b1f58fcc /Repository.mk | |
| parent | d48ab02bd3bdb8f33ad9b5ca6b2a641614da6ae4 (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.)
Reviewed-on: https://gerrit.libreoffice.org/42670
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit e79f1261549d9c497a38ea1af8843a86883b02cd)
Change-Id: I8d6d87f24974577fd66f5f3989f606237ebb3d75
Reviewed-on: https://gerrit.libreoffice.org/44979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index a1e9cb7b6cf1..963d58695d50 100644 --- a/Repository.mk +++ b/Repository.mk @@ -797,10 +797,10 @@ $(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ desktop_install \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ + $(if $(filter-out WNT,$(OS)),postprocess_fontconfig) \ extras_fonts \ extras_wordbook \ $(if $(filter MSC,$(COM)),msvc_dlls) \ - more_fonts_conf \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ odk_headers_generated \ |