From d7cecbb355b2720cee28fde2e8610ffb257587fe Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 6 Nov 2016 21:03:40 +0100 Subject: Bundle Google Noto fonts (cherry picked from commit 1b6ec3bddf80775fe939875c188c61cd4241441e) Change-Id: Ic39ef335a5829d7472090d253af7d6c74393c05a --- scp2/source/ooo/file_font_ooo.scp | 5 +++++ scp2/source/ooo/module_hidden_ooo.scp | 13 +++++++++++++ 2 files changed, 18 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index a606bf0366fd..1be67624a8ac 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -70,6 +70,11 @@ STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist") //Karla fonts STD_FONT_FILELIST(gid_File_Fnt_Karla, "fonts_karla.filelist") +#ifdef WITH_NOTO_FONT +// Noto fonts +STD_FONT_FILELIST(gid_File_Fnt_Noto, "fonts_noto.filelist") +#endif + #endif // fontconfig updates to allow proper use of local fonts diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index fda0c6a4d11c..457d94fb8eca 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -113,6 +113,19 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_EmojiOne_Color, gid_File_FcLocal_Conf); End +#ifdef WITH_NOTO_FONT +Module gid_Module_Root_Fonts_Noto_Hidden + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + InstallOrder = "100"; + Name = "gid_Module_Root_Fonts_Noto_Hidden"; + Description = "gid_Module_Root_Fonts_Noto_Hidden"; + Sortkey = "2150"; + Default = YES; + Styles = (HIDDEN_ROOT); + Files = (gid_File_Fnt_Noto); +End +#endif #endif Module gid_Module_Oo_Linguistic -- cgit