tdf#136604: Remove Source Sans Pro fonts
Templates using the fonts are left unchanged. Change-Id: I5ed21155ddd5038eb91f6ad6bcbd7f27f2478638 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143665 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@aliftype.com>
This commit is contained in:
@@ -177,7 +177,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
|||||||
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
|
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
|
||||||
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
|
||||||
|
@@ -1052,7 +1052,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
|
|||||||
fonts_libre_hebrew \
|
fonts_libre_hebrew \
|
||||||
fonts_noto \
|
fonts_noto \
|
||||||
fonts_reem \
|
fonts_reem \
|
||||||
fonts_sourcesans \
|
|
||||||
fonts_scheherazade \
|
fonts_scheherazade \
|
||||||
) \
|
) \
|
||||||
))
|
))
|
||||||
|
@@ -153,11 +153,6 @@ FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-201
|
|||||||
# three static lines
|
# three static lines
|
||||||
# so that git cherry-pick
|
# so that git cherry-pick
|
||||||
# will not run into conflicts
|
# will not run into conflicts
|
||||||
FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
|
|
||||||
FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
|
|
||||||
# three static lines
|
|
||||||
# so that git cherry-pick
|
|
||||||
# will not run into conflicts
|
|
||||||
FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
|
FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
|
||||||
FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
|
FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
|
||||||
# three static lines
|
# three static lines
|
||||||
|
@@ -1,27 +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_sourcesans,font_sourcesans))
|
|
||||||
|
|
||||||
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
|
|
||||||
SourceSansPro-BlackIt.ttf \
|
|
||||||
SourceSansPro-Black.ttf \
|
|
||||||
SourceSansPro-BoldIt.ttf \
|
|
||||||
SourceSansPro-Bold.ttf \
|
|
||||||
SourceSansPro-ExtraLightIt.ttf \
|
|
||||||
SourceSansPro-ExtraLight.ttf \
|
|
||||||
SourceSansPro-It.ttf \
|
|
||||||
SourceSansPro-LightIt.ttf \
|
|
||||||
SourceSansPro-Light.ttf \
|
|
||||||
SourceSansPro-Regular.ttf \
|
|
||||||
SourceSansPro-SemiboldIt.ttf \
|
|
||||||
SourceSansPro-Semibold.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
@@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
|
|||||||
ExternalPackage_liberation_narrow \
|
ExternalPackage_liberation_narrow \
|
||||||
ExternalPackage_libertineg \
|
ExternalPackage_libertineg \
|
||||||
ExternalPackage_libre_hebrew \
|
ExternalPackage_libre_hebrew \
|
||||||
ExternalPackage_sourcesans \
|
|
||||||
ExternalPackage_noto \
|
ExternalPackage_noto \
|
||||||
ExternalPackage_reem \
|
ExternalPackage_reem \
|
||||||
ExternalPackage_scheherazade \
|
ExternalPackage_scheherazade \
|
||||||
@@ -36,7 +35,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
|
|||||||
UnpackedTarball_liberation_narrow \
|
UnpackedTarball_liberation_narrow \
|
||||||
UnpackedTarball_libertineg \
|
UnpackedTarball_libertineg \
|
||||||
UnpackedTarball_libre_hebrew \
|
UnpackedTarball_libre_hebrew \
|
||||||
UnpackedTarball_sourcesans \
|
|
||||||
UnpackedTarball_noto \
|
UnpackedTarball_noto \
|
||||||
UnpackedTarball_reem \
|
UnpackedTarball_reem \
|
||||||
UnpackedTarball_scheherazade \
|
UnpackedTarball_scheherazade \
|
||||||
|
@@ -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_sourcesans))
|
|
||||||
|
|
||||||
$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcesans,$(FONT_SOURCESANS_TARBALL)))
|
|
||||||
|
|
||||||
# vim: set noet sw=4 ts=4:
|
|
@@ -2662,15 +2662,6 @@
|
|||||||
"Scheherazade" and "SIL". This license is copied below, and is also available with a FAQ at:
|
"Scheherazade" and "SIL". This license is copied below, and is also available with a FAQ at:
|
||||||
<a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
|
<a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
|
||||||
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
|
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
|
||||||
<h2>Source Sans Pro</h2>
|
|
||||||
<p>The following software may be included in this product: Source Sans Pro fonts. Use of any of this software
|
|
||||||
is governed by the terms of the license below:</p>
|
|
||||||
<p>Copyright 2010, 2012 Adobe Systems Incorporated (<a href="http://www.adobe.com/">http://www.adobe.com/</a>),
|
|
||||||
with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in
|
|
||||||
the United States and/or other countries.</p>
|
|
||||||
<p>This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below,
|
|
||||||
and is also available with a FAQ at: <a href="http://scripts.sil.org/OFL">http://scripts.sil.org/OFL</a></p>
|
|
||||||
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="DICTIONARIES">
|
<div class="DICTIONARIES">
|
||||||
<hr />
|
<hr />
|
||||||
|
@@ -137,13 +137,6 @@
|
|||||||
"dest": "external/tarballs",
|
"dest": "external/tarballs",
|
||||||
"dest-filename": "@FONT_LINLIBERTINEG_TARBALL@"
|
"dest-filename": "@FONT_LINLIBERTINEG_TARBALL@"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"url": "https://dev-www.libreoffice.org/src/@FONT_SOURCESANS_TARBALL@",
|
|
||||||
"sha256": "@FONT_SOURCESANS_SHA256SUM@",
|
|
||||||
"type": "file",
|
|
||||||
"dest": "external/tarballs",
|
|
||||||
"dest-filename": "@FONT_SOURCESANS_TARBALL@"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"url": "https://dev-www.libreoffice.org/src/@BOOST_TARBALL@",
|
"url": "https://dev-www.libreoffice.org/src/@BOOST_TARBALL@",
|
||||||
"sha256": "@BOOST_SHA256SUM@",
|
"sha256": "@BOOST_SHA256SUM@",
|
||||||
|
Binary file not shown.
@@ -268,7 +268,7 @@ std::vector<FontSet> initFontSets()
|
|||||||
aFontSet.maName = "Source Sans Family";
|
aFontSet.maName = "Source Sans Family";
|
||||||
aFontSet.msHeadingFont = "Source Sans Pro";
|
aFontSet.msHeadingFont = "Source Sans Pro";
|
||||||
aFontSet.msBaseFont = "Source Sans Pro";
|
aFontSet.msBaseFont = "Source Sans Pro";
|
||||||
aFontSet.msMonoFont = "Liberation Mono";
|
aFontSet.msMonoFont = "Source Code Pro";
|
||||||
aFontSets.push_back(aFontSet);
|
aFontSets.push_back(aFontSet);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -276,7 +276,7 @@ std::vector<FontSet> initFontSets()
|
|||||||
aFontSet.maName = "Source Sans Family 2";
|
aFontSet.maName = "Source Sans Family 2";
|
||||||
aFontSet.msHeadingFont = "Source Sans Pro";
|
aFontSet.msHeadingFont = "Source Sans Pro";
|
||||||
aFontSet.msBaseFont = "Source Sans Pro Light";
|
aFontSet.msBaseFont = "Source Sans Pro Light";
|
||||||
aFontSet.msMonoFont = "Liberation Mono";
|
aFontSet.msMonoFont = "Source Code Pro";
|
||||||
aFontSets.push_back(aFontSet);
|
aFontSets.push_back(aFontSet);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
Binary file not shown.
Reference in New Issue
Block a user