[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch officecfg/registry scp2/source
Akshay Deep
akshaydeepiitr at gmail.com
Tue Nov 29 08:52:48 UTC 2016
Makefile.fetch | 1
download.lst | 2 +
external/more_fonts/ExternalPackage_EmojiOne_Color.mk | 16 +++++++++++++
external/more_fonts/Module_more_fonts.mk | 2 +
external/more_fonts/UnpackedTarball_EmojiOne_Color.mk | 14 +++++++++++
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 -
scp2/source/ooo/file_font_ooo.scp | 3 ++
scp2/source/ooo/module_hidden_ooo.scp | 1
8 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit 9e422bc19144ce3f0645e49450428802eab1abba
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date: Sat Nov 26 02:26:30 2016 +0530
EMOJI CONTROL: Add EmojiOne font for Emoji Support
Noto Emoji does not provide glyphs for all emojis in the toolbar
Change-Id: If3f3ea6e12f0b8824cb95e3db78c3c7aced4de8b
Reviewed-on: https://gerrit.libreoffice.org/31215
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/Makefile.fetch b/Makefile.fetch
index c552289..a292099 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -179,6 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(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) \
$(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_TARBALL) \
diff --git a/download.lst b/download.lst
index 08bace6..d20827e 100644
--- a/download.lst
+++ b/download.lst
@@ -50,6 +50,8 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.
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
export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
diff --git a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk
new file mode 100644
index 0000000..76cdb66
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk
@@ -0,0 +1,16 @@
+# -*- 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_emojione_color,font_emojione_color))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_emojione_color,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ EmojiOneColor-SVGinOT.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 54bb9b9..452d91b 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_sourcecode \
ExternalPackage_sourcesans \
ExternalPackage_NotoEmoji \
+ ExternalPackage_EmojiOne_Color \
UnpackedTarball_caladea \
UnpackedTarball_carlito \
UnpackedTarball_dejavu \
@@ -35,6 +36,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_sourcecode \
UnpackedTarball_sourcesans \
UnpackedTarball_NotoEmoji \
+ UnpackedTarball_EmojiOne_Color \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk b/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk
new file mode 100644
index 0000000..d931c77
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk
@@ -0,0 +1,14 @@
+# -*- 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_emojione_color))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_emojione_color,$(FONT_EMOJIONE_COLOR_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index abd9c39..c869ca9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5572,7 +5572,7 @@
<info>
<desc>Special font for rendering of emojis</desc>
</info>
- <value>Noto Emoji</value>
+ <value>EmojiOne Color</value>
</prop>
<prop oor:name="PluginsEnabled" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: ? -->
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 5475b8d..b552fd2 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -65,6 +65,9 @@ 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")
+
#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 fa3969f..055e554 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -110,6 +110,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_SourceSans,
gid_File_Fnt_SourceCode,
gid_File_Fnt_NotoEmoji,
+ gid_File_Fnt_EmojiOne_Color,
gid_File_FcLocal_Conf);
End
#endif
More information about the Libreoffice-commits
mailing list