mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install fc_local.conf only where used

Browse Source 
...and at least issue a SAL_INFO when it's missing (there may theoretically be
multiple directories, and it need not be present in every one, so nothing
stronger than SAL_INFO can be used)

Change-Id: I9b7257a551626e5ad081cfb75422a8bd71b86aa4
Reviewed-on: https://gerrit.libreoffice.org/42714
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-09-24 19:59:43 +02:00
parent 59ec0fe032
commit d383d0e985
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postprocess/Module_postprocess.mk
View File

@@ -28,11 +28,13 @@ $(eval $(call gb_Module_add_targets,postprocess,\
)) ))
endif endif
# For non-WNT, add instdir/share/fonts/truetype/fc_local.conf when it shall # For configurations that use fontconfig (cf. inclusion of
# vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add
# instdir/share/fonts/truetype/fc_local.conf when it shall
# contain content from at least one of external/more_fonts/fc_local.snippet # contain content from at least one of external/more_fonts/fc_local.snippet
# (conditional on MORE_FONTS in BUILD_TYPE) and # (conditional on MORE_FONTS in BUILD_TYPE) and
# extras/source/truetype/symbol/fc_local.snippet (unconditional): # extras/source/truetype/symbol/fc_local.snippet (unconditional):
ifneq ($(OS),WNT) ifneq ($(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,postprocess, \ $(eval $(call gb_Module_add_targets,postprocess, \
CustomTarget_fontconfig \ CustomTarget_fontconfig \
Package_fontconfig \ Package_fontconfig \

2
vcl/unx/generic/fontmanager/fontconfig.cxx
View File

@@ -681,6 +681,8 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName )
reinterpret_cast<FcChar8 const *>(aConfFileName.getStr()), FcTrue); reinterpret_cast<FcChar8 const *>(aConfFileName.getStr()), FcTrue);
if( !bCfgOk ) if( !bCfgOk )
fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
} else {
SAL_INFO("vcl", "cannot open " << aConfFileName);
} }
} }