diff options
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | download.lst | 1 | ||||
| -rw-r--r-- | external/more_fonts/ExternalPackage_NotoEmoji.mk | 16 | ||||
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/UnpackedTarball_NotoEmoji.mk | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/file_font_ooo.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
7 files changed, 0 insertions, 38 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index a292099401c5..3e21be38685e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -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_SOURCECODE_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,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ diff --git a/download.lst b/download.lst index d20827eb5499..3e3313b8500f 100644 --- a/download.lst +++ b/download.lst @@ -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_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_NOTOEMOJI_TARBALL := 61f45f3d6cb7f874aecbe6cdc8ba26a2-NotoEmoji-unhinted.tar.gz export FONT_EMOJIONE_COLOR_MD5SUM := 919389b307ee8696288ea3b8210ab974 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7 diff --git a/external/more_fonts/ExternalPackage_NotoEmoji.mk b/external/more_fonts/ExternalPackage_NotoEmoji.mk deleted file mode 100644 index 2540ab32b341..000000000000 --- a/external/more_fonts/ExternalPackage_NotoEmoji.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index 452d91b0af7e..f584a8fec4a5 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_ptserif \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ - ExternalPackage_NotoEmoji \ ExternalPackage_EmojiOne_Color \ UnpackedTarball_caladea \ UnpackedTarball_carlito \ @@ -35,7 +34,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_ptserif \ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ - UnpackedTarball_NotoEmoji \ UnpackedTarball_EmojiOne_Color \ )) diff --git a/external/more_fonts/UnpackedTarball_NotoEmoji.mk b/external/more_fonts/UnpackedTarball_NotoEmoji.mk deleted file mode 100644 index 0c773b6248cf..000000000000 --- a/external/more_fonts/UnpackedTarball_NotoEmoji.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- 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: diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index b552fd271b26..6dfe05538c10 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -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_Caladea, "fonts_caladea.filelist") -// Noto Emoji font -STD_FONT_FILELIST(gid_File_Fnt_NotoEmoji, "fonts_notoemoji.filelist") - // EmojiOne_Color font STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist") diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 055e5545c545..a725b65bbba5 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -109,7 +109,6 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_OpenSans, gid_File_Fnt_SourceSans, gid_File_Fnt_SourceCode, - gid_File_Fnt_NotoEmoji, gid_File_Fnt_EmojiOne_Color, gid_File_FcLocal_Conf); End |