diff options
-rw-r--r-- | Makefile.fetch | 2 | ||||
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/more_fonts/ExternalPackage_sourcecode.mk | 29 | ||||
-rw-r--r-- | external/more_fonts/ExternalPackage_sourceserif.mk | 27 | ||||
-rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 4 | ||||
-rw-r--r-- | external/more_fonts/UnpackedTarball_sourcecode.mk | 14 | ||||
-rw-r--r-- | external/more_fonts/UnpackedTarball_sourceserif.mk | 14 | ||||
-rw-r--r-- | readlicense_oo/license/license.xml | 18 | ||||
-rw-r--r-- | solenv/flatpak-manifest.in | 14 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.cxx | 4 |
11 files changed, 2 insertions, 130 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index be1f988adf2a..07454893d700 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,9 +177,7 @@ $(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_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_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 15a75405ee23..bc51c5c1be5d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1047,9 +1047,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libre_hebrew \ fonts_noto \ fonts_reem \ - fonts_sourcecode \ fonts_sourcesans \ - fonts_sourceserif \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 754c42a57f7c..c0f41e15ee4d 100644 --- a/download.lst +++ b/download.lst @@ -66,12 +66,8 @@ export FONT_LIBERATION_SHA256SUM := 26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d4 export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz export FONT_LINLIBERTINEG_SHA256SUM := 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -export FONT_SOURCECODE_SHA256SUM := 09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f -export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 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_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk deleted file mode 100644 index 5f1d7f7c5b31..000000000000 --- a/external/more_fonts/ExternalPackage_sourcecode.mk +++ /dev/null @@ -1,29 +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_sourcecode,font_sourcecode)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceCodePro-BlackIt.ttf \ - SourceCodePro-Black.ttf \ - SourceCodePro-BoldIt.ttf \ - SourceCodePro-Bold.ttf \ - SourceCodePro-ExtraLightIt.ttf \ - SourceCodePro-ExtraLight.ttf \ - SourceCodePro-It.ttf \ - SourceCodePro-LightIt.ttf \ - SourceCodePro-Light.ttf \ - SourceCodePro-MediumIt.ttf \ - SourceCodePro-Medium.ttf \ - SourceCodePro-Regular.ttf \ - SourceCodePro-SemiboldIt.ttf \ - SourceCodePro-Semibold.ttf \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_sourceserif.mk b/external/more_fonts/ExternalPackage_sourceserif.mk deleted file mode 100644 index 6a5272bbaa7a..000000000000 --- a/external/more_fonts/ExternalPackage_sourceserif.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_sourceserif,font_sourceserif)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourceserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - SourceSerifPro-BoldIt.ttf \ - SourceSerifPro-ExtraLight.ttf \ - SourceSerifPro-Light.ttf \ - SourceSerifPro-Semibold.ttf \ - SourceSerifPro-BlackIt.ttf \ - SourceSerifPro-Bold.ttf \ - SourceSerifPro-It.ttf \ - SourceSerifPro-Regular.ttf \ - SourceSerifPro-Black.ttf \ - SourceSerifPro-ExtraLightIt.ttf \ - SourceSerifPro-LightIt.ttf \ - SourceSerifPro-SemiboldIt.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 0d4ae72cf14d..233d890c6097 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ ExternalPackage_libre_hebrew \ - ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ - ExternalPackage_sourceserif \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -40,9 +38,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ UnpackedTarball_libre_hebrew \ - UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ - UnpackedTarball_sourceserif \ UnpackedTarball_noto \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_sourcecode.mk b/external/more_fonts/UnpackedTarball_sourcecode.mk deleted file mode 100644 index 7040e9b185ba..000000000000 --- a/external/more_fonts/UnpackedTarball_sourcecode.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_sourcecode)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcecode,$(FONT_SOURCECODE_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_sourceserif.mk b/external/more_fonts/UnpackedTarball_sourceserif.mk deleted file mode 100644 index 0e8407320733..000000000000 --- a/external/more_fonts/UnpackedTarball_sourceserif.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_sourceserif)) - -$(eval $(call gb_UnpackedTarball_set_tarball,font_sourceserif,$(FONT_SOURCESERIF_TARBALL))) - -# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 749861d220bc..f5d933ceb9f1 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2668,15 +2668,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 Code Pro</h2> - <p>The following software may be included in this product: Source Code 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> <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> @@ -2686,15 +2677,6 @@ <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> - <h2>Source Serif Pro</h2> - <p>The following software may be included in this product: Source Serif Pro fonts. Use of any of this software - is governed by the terms of the license below:</p> - <p>Copyright 2014 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 fe2c388aa174..8b2426ecebca 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_SOURCECODE_TARBALL@", - "sha256": "@FONT_SOURCECODE_SHA256SUM@", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "@FONT_SOURCECODE_TARBALL@" - }, - { "url": "https://dev-www.libreoffice.org/src/@FONT_SOURCESANS_TARBALL@", "sha256": "@FONT_SOURCESANS_SHA256SUM@", "type": "file", @@ -152,13 +145,6 @@ "dest-filename": "@FONT_SOURCESANS_TARBALL@" }, { - "url": "https://dev-www.libreoffice.org/src/@FONT_SOURCESERIF_TARBALL@", - "sha256": "@FONT_SOURCESERIF_SHA256SUM@", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "@FONT_SOURCESERIF_TARBALL@" - }, - { "url": "https://dev-www.libreoffice.org/src/@BOOST_TARBALL@", "sha256": "@BOOST_SHA256SUM@", "type": "file", diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index d6517d6a84ad..5b17955dd77d 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -278,7 +278,7 @@ std::vector<FontSet> initFontSets() aFontSet.maName = "Source Sans Family"; aFontSet.msHeadingFont = "Source Sans Pro"; aFontSet.msBaseFont = "Source Sans Pro"; - aFontSet.msMonoFont = "Source Code Pro"; + aFontSet.msMonoFont = "Liberation Mono"; aFontSets.push_back(aFontSet); } { @@ -286,7 +286,7 @@ std::vector<FontSet> initFontSets() aFontSet.maName = "Source Sans Family 2"; aFontSet.msHeadingFont = "Source Sans Pro"; aFontSet.msBaseFont = "Source Sans Pro Light"; - aFontSet.msMonoFont = "Source Code Pro"; + aFontSet.msMonoFont = "Liberation Mono"; aFontSets.push_back(aFontSet); } { |