scp2/source/ooo/file_font_ooo.scp | 10 +++++++--- scp2/source/ooo/module_hidden_ooo.scp | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 27df6cd7d168f637b9b642e826bed8f2e25cfb34 Author: Andras Timar <andras.ti...@collabora.com> Date: Fri Jul 4 14:29:01 2014 +0200 add Carlito/Caladea fonts to install script They were added in libreoffice-4-1 branch but not anywhere else. See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534 (cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693) diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 5e27d1f..e13dee3 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" ) -#ifndef WITHOUT_FONTS +#ifndef WITHOUT_FONTS // DejaVu fonts STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist") @@ -60,12 +60,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist") // Source Code Pro fonts 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 // fontconfig updates to allow proper use of local fonts #ifdef UNX -#ifndef WITHOUT_FONTS +#ifndef WITHOUT_FONTS File gid_File_FcLocal_Conf Dir = FILELIST_DIR; USER_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 22edd6c..e75d860 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -374,6 +374,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Fnt_Opensymb, + gid_File_Fnt_Caladea, + gid_File_Fnt_Carlito, gid_File_Fnt_DejaVu, gid_File_Fnt_Gentium, gid_File_Fnt_LibSansNarrow, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits