tdf#144348: Remove EmojiOne Color font
The EmojiFont setting is now a comma-separated list of the three common color emoji fonts, it should fallback to the next font if the first is missing. Change-Id: I7aa134f914ab829704e9b707f511f166a81a0089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140623 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@aliftype.com>
This commit is contained in:
Khaled Hosny
خالد حسني
parent
093143c575
commit
694f8eb1f7
@ -180,7 +180,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
|
||||
|
||||
@ -1044,7 +1044,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
|
||||
fonts_carlito \
|
||||
$(if $(MPL_SUBSET),,fonts_culmus) \
|
||||
fonts_dejavu \
|
||||
fonts_emojione_color \
|
||||
fonts_gentium \
|
||||
$(if $(MPL_SUBSET),,fonts_kacst) \
|
||||
fonts_liberation \
|
||||
|
||||
@ -72,8 +72,6 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc
|
||||
export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
|
||||
export FONT_SOURCESERIF_SHA256SUM := 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
|
||||
export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
|
||||
export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
|
||||
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
|
||||
export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
|
||||
export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
|
||||
export FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
|
||||
|
||||
@ -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_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:
|
||||
2
external/more_fonts/Module_more_fonts.mk
vendored
2
external/more_fonts/Module_more_fonts.mk
vendored
@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
|
||||
ExternalPackage_noto \
|
||||
ExternalPackage_reem \
|
||||
ExternalPackage_scheherazade \
|
||||
ExternalPackage_EmojiOne_Color \
|
||||
UnpackedTarball_alef \
|
||||
UnpackedTarball_amiri \
|
||||
UnpackedTarball_caladea \
|
||||
@ -47,7 +46,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
|
||||
UnpackedTarball_noto \
|
||||
UnpackedTarball_reem \
|
||||
UnpackedTarball_scheherazade \
|
||||
UnpackedTarball_EmojiOne_Color \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
@ -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_emojione_color))
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_set_tarball,font_emojione_color,$(FONT_EMOJIONE_COLOR_TARBALL)))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@ -5421,7 +5421,7 @@
|
||||
<info>
|
||||
<desc>Special font for rendering of emojis</desc>
|
||||
</info>
|
||||
<value>EmojiOne Color</value>
|
||||
<value>Segoe UI Emoji,Apple Color Emoji,Noto Color Emoji</value>
|
||||
</prop>
|
||||
<prop oor:name="FontsUseWinMetrics" oor:type="oor:string-list" oor:nillable="false">
|
||||
<info>
|
||||
|
||||
@ -2508,45 +2508,6 @@
|
||||
<p>Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise
|
||||
to promote the sale, use or other dealings in this Font Software without prior written authorization from
|
||||
Tavmjong Bah. For further information, contact: tavmjong @ free . fr.</p>
|
||||
<h2>EmojiOne Color</h2>
|
||||
<h3>Licenses</h3>
|
||||
<ul>
|
||||
<li>Copyright 2016 Brad Erickson CC-BY-4.0/MIT</li>
|
||||
<li>Copyright 2015 Ranks.com Inc. CC-BY-4.0</li>
|
||||
<li>Copyright 2013 Joe Loughry and Terence Eden MIT</li>
|
||||
</ul>
|
||||
<h4>Artwork</h4>
|
||||
<ul>
|
||||
<li>Applies to SVG files and TTF font files</li>
|
||||
<li>License: Creative Commons Attribution 4.0 International</li>
|
||||
<li>Human Readable License: <a href=
|
||||
"http://creativecommons.org/licenses/by/4.0/">http://creativecommons.org/licenses/by/4.0/</a></li>
|
||||
<li>Complete Legal Terms: <a href=
|
||||
"http://creativecommons.org/licenses/by/4.0/legalcode">http://creativecommons.org/licenses/by/4.0/legalcode</a></li>
|
||||
</ul>
|
||||
<h4>Source Code</h4>
|
||||
<ul>
|
||||
<li>Applies to everything else</li>
|
||||
<li>License: MIT</li>
|
||||
<li>Complete Legal Terms: http://opensource.org/licenses/MIT</li>
|
||||
</ul>
|
||||
<h4>EmojiOne License</h4>
|
||||
<p>The SVG files of the <a href="http://emojione.com/">EmojiOne</a> project have been modified to create the
|
||||
fallback emoji glyphs and used as-is for the SVGinOT color glyphs. Files are stored in
|
||||
<code>assets/emojione-svg</code>.</p>
|
||||
<ul>
|
||||
<li>Source: https://github.com/Ranks/emojione</li>
|
||||
<li>Art License: Creative Commons Attribution 4.0 International</li>
|
||||
</ul>
|
||||
<p>Please review the specific attribution requirements for commercial use of EmojiOne graphics:
|
||||
<a href="http://emojione.com/licensing/">http://emojione.com/licensing/</a></p>
|
||||
<h4>Power Symbol License</h4>
|
||||
<p>The SVG files from the <a href="http://unicodepowersymbol.com/">Unicode Power Symbol</a> project have been
|
||||
modified to create B&W Power Symbol glyphs. Files are stored in <code>assets/svg-bw</code>.</p>
|
||||
<ul>
|
||||
<li>Source: <a href="https://github.com/jloughry/Unicode">https://github.com/jloughry/Unicode</a></li>
|
||||
<li>Art License: MIT</li>
|
||||
</ul>
|
||||
<h2>Gentium</h2>
|
||||
<p>The following software may be included in this product: Gentium fonts. Use of any of this software is
|
||||
governed by the terms of the license below:</p>
|
||||
|
||||
@ -158,13 +158,6 @@
|
||||
"dest": "external/tarballs",
|
||||
"dest-filename": "@FONT_SOURCESERIF_TARBALL@"
|
||||
},
|
||||
{
|
||||
"url": "https://dev-www.libreoffice.org/src/@FONT_EMOJIONE_COLOR_TARBALL@",
|
||||
"sha256": "@FONT_EMOJIONE_COLOR_SHA256SUM@",
|
||||
"type": "file",
|
||||
"dest": "external/tarballs",
|
||||
"dest-filename": "@FONT_EMOJIONE_COLOR_TARBALL@"
|
||||
},
|
||||
{
|
||||
"url": "https://dev-www.libreoffice.org/src/@BOOST_TARBALL@",
|
||||
"sha256": "@BOOST_SHA256SUM@",
|
||||
|
||||
@ -1183,7 +1183,7 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
|
||||
if (bMissingJustBullet)
|
||||
{
|
||||
assert(rPattern.maTargetName == "Amiri Quran" || rPattern.maTargetName == "David CLM" ||
|
||||
rPattern.maTargetName == "EmojiOne Color" || rPattern.maTargetName == "Frank Ruehl CLM" ||
|
||||
rPattern.maTargetName == "Frank Ruehl CLM" ||
|
||||
rPattern.maTargetName == "KacstBook" || rPattern.maTargetName == "KacstOffice" ||
|
||||
rPattern.maTargetName == "Noto Sans Arabic");
|
||||
// These fonts exist in "more_fonts", but have no U+00B7 MIDDLE DOT
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user