summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-07-04 14:29:01 +0200
committerAndras Timar <andras.timar@collabora.com>2014-07-04 14:29:01 +0200
commit97f63c17f7bc069a12e3afc3975f09897731a693 (patch)
tree0047bae1356e1428bff75abdf6cafb1bea62b586
parent4efc9e9007bf8f7447111dbecb7fe48fd8116d3f (diff)
add Carlito/Caladea fonts to install script
They were added in libreoffice-4-1 branch but not anywhere else. See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
-rw-r--r--scp2/source/ooo/file_font_ooo.scp10
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp2
2 files changed, 9 insertions, 3 deletions
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index e7a2da352a34..597d5af1f0ff 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")
@@ -58,12 +58,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 e01c2c3b3ee5..d7dd6e04fe49 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -315,6 +315,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,