[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - scp2/source

[David Tardon]

 scp2/source/ooo/file_font_ooo.scp |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit aa0feb730eb9829f7e9df81d63ff4e2e3afb87b1
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 13 23:09:34 2017 +0100

    always install fc_local.conf on linux
    
    ... as it is now used for OpenSymbol too.
    
    Change-Id: I36628dcb9591c4098d8c360d2b8359bfc8d58dc8
    Reviewed-on: https://gerrit.libreoffice.org/46429
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index e9207797fbc8..96a22d55203e 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -70,7 +70,6 @@ STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef USING_X11
-#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
     Dir = FILELIST_DIR;
     USER_FILE_BODY;
@@ -78,4 +77,3 @@ File gid_File_FcLocal_Conf
     Name = "postprocess_fontconfig.filelist";
 End
 #endif
-#endif