Kaydet (Commit) 97f63c17 authored tarafından Andras Timar's avatar Andras Timar

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
üst 4efc9e90
/************************************************************************* /*************************************************************************
* *
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright 2000, 2010 Oracle and/or its affiliates. * Copyright 2000, 2010 Oracle and/or its affiliates.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" ) STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
#ifndef WITHOUT_FONTS #ifndef WITHOUT_FONTS
// DejaVu fonts // DejaVu fonts
STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist") STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
...@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist") ...@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist")
// Source Code Pro fonts // Source Code Pro fonts
STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist") STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
//Carlito and Caladea fonts
STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
#endif #endif
// fontconfig updates to allow proper use of local fonts // fontconfig updates to allow proper use of local fonts
#ifdef UNX #ifdef UNX
#ifndef WITHOUT_FONTS #ifndef WITHOUT_FONTS
File gid_File_FcLocal_Conf File gid_File_FcLocal_Conf
Dir = FILELIST_DIR; Dir = FILELIST_DIR;
USER_FILE_BODY; USER_FILE_BODY;
......
...@@ -315,6 +315,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden ...@@ -315,6 +315,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb, Files = (gid_File_Fnt_Opensymb,
gid_File_Fnt_Caladea,
gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu, gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium, gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow, gid_File_Fnt_LibSansNarrow,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment