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

Remove Noto Emoji font

Conflicts:
	Makefile.fetch
	download.lst
	external/more_fonts/Module_more_fonts.mk
	scp2/source/ooo/file_font_ooo.scp
	scp2/source/ooo/module_hidden_ooo.scp

Change-Id: Ic43807cde11fff21d78bece6874783ba154655a2
Reviewed-on: https://gerrit.libreoffice.org/31390Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 7339a3d3
...@@ -178,7 +178,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) ...@@ -178,7 +178,6 @@ $(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,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_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) \
......
...@@ -49,7 +49,6 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font- ...@@ -49,7 +49,6 @@ 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 := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.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 FONT_EMOJIONE_COLOR_MD5SUM := 919389b307ee8696288ea3b8210ab974 export FONT_EMOJIONE_COLOR_MD5SUM := 919389b307ee8696288ea3b8210ab974
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7
......
# -*- 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,7 +22,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ...@@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_ptserif \ ExternalPackage_ptserif \
ExternalPackage_sourcecode \ ExternalPackage_sourcecode \
ExternalPackage_sourcesans \ ExternalPackage_sourcesans \
ExternalPackage_NotoEmoji \
ExternalPackage_EmojiOne_Color \ ExternalPackage_EmojiOne_Color \
UnpackedTarball_caladea \ UnpackedTarball_caladea \
UnpackedTarball_carlito \ UnpackedTarball_carlito \
...@@ -35,7 +34,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ...@@ -35,7 +34,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_ptserif \ UnpackedTarball_ptserif \
UnpackedTarball_sourcecode \ UnpackedTarball_sourcecode \
UnpackedTarball_sourcesans \ UnpackedTarball_sourcesans \
UnpackedTarball_NotoEmoji \
UnpackedTarball_EmojiOne_Color \ UnpackedTarball_EmojiOne_Color \
)) ))
......
# -*- 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,9 +62,6 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist") ...@@ -62,9 +62,6 @@ 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")
// EmojiOne_Color font // EmojiOne_Color font
STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist") STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
......
...@@ -109,7 +109,6 @@ Module gid_Module_Root_Fonts_OOo_Hidden ...@@ -109,7 +109,6 @@ 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_Fnt_EmojiOne_Color, gid_File_Fnt_EmojiOne_Color,
gid_File_FcLocal_Conf); gid_File_FcLocal_Conf);
End End
......
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