diff options
author | Khaled Hosny <khaled@aliftype.com> | 2022-12-05 12:09:38 +0200 |
---|---|---|
committer | خالد حسني <khaled@aliftype.com> | 2022-12-31 19:34:37 +0000 |
commit | 5d42f4403d4e51f33ad8f2ce9efbed542978b521 (patch) | |
tree | 81454c6203bfe14f0856b16a569ce4ba618d2960 | |
parent | eefa5cb64f97845e80ab23984bb7b516174fa817 (diff) |
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>
-rw-r--r-- | Makefile.fetch | 1 | ||||
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | download.lst | 5 | ||||
-rw-r--r-- | external/more_fonts/ExternalPackage_sourcesans.mk | 27 | ||||
-rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
-rw-r--r-- | external/more_fonts/UnpackedTarball_sourcesans.mk | 14 | ||||
-rw-r--r-- | readlicense_oo/license/license.xml | 9 | ||||
-rw-r--r-- | solenv/flatpak-manifest.in | 7 | ||||
-rw-r--r-- | sw/qa/uitest/data/metadata.odt | bin | 10066 -> 13623 bytes | |||
-rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/pdfexport/data/tdf148442.odt | bin | 10558 -> 10562 bytes |
11 files changed, 2 insertions, 68 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 053cb3190a49..c8c5c91941f2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -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_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_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index d6db83c47873..ff20165796a5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1052,7 +1052,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libre_hebrew \ fonts_noto \ fonts_reem \ - fonts_sourcesans \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 5eed30c442ec..6cfc19a0573b 100644 --- a/download.lst +++ b/download.lst @@ -153,11 +153,6 @@ FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-201 # three static lines # so that git cherry-pick # 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_TARBALL := noto-fonts-20171024.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk deleted file mode 100644 index cd7ac29e92af..000000000000 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ /dev/null @@ -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: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index b97f71ac5c64..001e9bcc2d03 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ ExternalPackage_libre_hebrew \ - ExternalPackage_sourcesans \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -36,7 +35,6 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ UnpackedTarball_libre_hebrew \ - UnpackedTarball_sourcesans \ UnpackedTarball_noto \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_sourcesans.mk b/external/more_fonts/UnpackedTarball_sourcesans.mk deleted file mode 100644 index 65ff325535a1..000000000000 --- a/external/more_fonts/UnpackedTarball_sourcesans.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_sourcesans)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcesans,$(FONT_SOURCESANS_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 56c4b65411da..f26f923206f6 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2662,15 +2662,6 @@ "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> <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 class="DICTIONARIES"> <hr /> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 60f6bf8c87cc..fd1570418557 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -138,13 +138,6 @@ "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@", "sha256": "@BOOST_SHA256SUM@", "type": "file", diff --git a/sw/qa/uitest/data/metadata.odt b/sw/qa/uitest/data/metadata.odt Binary files differindex 1566f4ae1d73..8bd7654d045a 100644 --- a/sw/qa/uitest/data/metadata.odt +++ b/sw/qa/uitest/data/metadata.odt diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 9be8649def38..14a58b236d91 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -268,7 +268,7 @@ std::vector<FontSet> initFontSets() aFontSet.maName = "Source Sans Family"; aFontSet.msHeadingFont = "Source Sans Pro"; aFontSet.msBaseFont = "Source Sans Pro"; - aFontSet.msMonoFont = "Liberation Mono"; + aFontSet.msMonoFont = "Source Code Pro"; aFontSets.push_back(aFontSet); } { @@ -276,7 +276,7 @@ std::vector<FontSet> initFontSets() aFontSet.maName = "Source Sans Family 2"; aFontSet.msHeadingFont = "Source Sans Pro"; aFontSet.msBaseFont = "Source Sans Pro Light"; - aFontSet.msMonoFont = "Liberation Mono"; + aFontSet.msMonoFont = "Source Code Pro"; aFontSets.push_back(aFontSet); } { diff --git a/vcl/qa/cppunit/pdfexport/data/tdf148442.odt b/vcl/qa/cppunit/pdfexport/data/tdf148442.odt Binary files differindex 819595df22a2..10a5abf48e9e 100644 --- a/vcl/qa/cppunit/pdfexport/data/tdf148442.odt +++ b/vcl/qa/cppunit/pdfexport/data/tdf148442.odt |