Kaydet (Commit) ecb09684 authored tarafından Akshay Deep's avatar Akshay Deep Kaydeden (comit) Samuel Mehrbrodt

Add Noto Emoji font for emoji support

Change-Id: I57cc123ec5e1f90967e82a60fdea792974054f86
Reviewed-on: https://gerrit.libreoffice.org/26800Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 3b6b0ea6
...@@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) ...@@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTOEMOJI_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_TARBALL) \ $(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_TARBALL) \
......
...@@ -51,6 +51,7 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font- ...@@ -51,6 +51,7 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-
export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz
export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
export FONT_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz
export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7
export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
......
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_notoemoji,font_notoemoji))
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_notoemoji,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoEmoji-Regular.ttf \
))
# vim: set noet sw=4 ts=4:
...@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ...@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_ptserif \ ExternalPackage_ptserif \
ExternalPackage_sourcecode \ ExternalPackage_sourcecode \
ExternalPackage_sourcesans \ ExternalPackage_sourcesans \
ExternalPackage_NotoEmoji \
UnpackedTarball_caladea \ UnpackedTarball_caladea \
UnpackedTarball_carlito \ UnpackedTarball_carlito \
UnpackedTarball_dejavu \ UnpackedTarball_dejavu \
...@@ -33,6 +34,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ...@@ -33,6 +34,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_ptserif \ UnpackedTarball_ptserif \
UnpackedTarball_sourcecode \ UnpackedTarball_sourcecode \
UnpackedTarball_sourcesans \ UnpackedTarball_sourcesans \
UnpackedTarball_NotoEmoji \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notoemoji))
$(eval $(call gb_UnpackedTarball_set_tarball,font_notoemoji,$(FONT_NOTOEMOJI_TARBALL)))
# vim: set noet sw=4 ts=4:
...@@ -62,6 +62,9 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist") ...@@ -62,6 +62,9 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist") STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist") STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
// Noto Emoji font
STD_FONT_FILELIST(gid_File_Fnt_NotoEmoji, "fonts_notoemoji.filelist")
#endif #endif
// fontconfig updates to allow proper use of local fonts // fontconfig updates to allow proper use of local fonts
......
...@@ -109,6 +109,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden ...@@ -109,6 +109,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_OpenSans, gid_File_Fnt_OpenSans,
gid_File_Fnt_SourceSans, gid_File_Fnt_SourceSans,
gid_File_Fnt_SourceCode, gid_File_Fnt_SourceCode,
gid_File_Fnt_NotoEmoji,
gid_File_FcLocal_Conf); gid_File_FcLocal_Conf);
End End
#endif #endif
......
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