diff options
| -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_opensans.mk | 51 | ||||
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/UnpackedTarball_opensans.mk | 14 | ||||
| -rw-r--r-- | readlicense_oo/license/license.xml | 4 |
7 files changed, 78 insertions, 0 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 8327d703ee90..8295de2ab366 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -186,6 +186,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_OPEN_SANS_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYTHES,MYTHES_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 80e511671626..e234b1bdeb85 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1054,6 +1054,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libre_hebrew \ fonts_noto \ fonts_opendyslexic \ + fonts_opensans \ fonts_reem \ fonts_sourcesans \ fonts_scheherazade \ diff --git a/download.lst b/download.lst index cddfe30317fd..ed7bc71f0fa8 100644 --- a/download.lst +++ b/download.lst @@ -251,6 +251,11 @@ FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.910.12-rc2-2019.10.17.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_OPEN_SANS_TARBALL := Open_Sans.zip +FONT_OPEN_SANS_SHA256SUM := 85d79a39d26acb207ba13fb1007189d55355a0faf2cf7ccfe6a2edf2abac06d9 +# three static lines +# so that git cherry-pick +# will not run into conflicts FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz # three static lines diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk new file mode 100644 index 000000000000..8a6b8d775eb7 --- /dev/null +++ b/external/more_fonts/ExternalPackage_opensans.mk @@ -0,0 +1,51 @@ +# -*- 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_opensans,font_opensans)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + static/OpenSans_Condensed/OpenSans_Condensed-Bold.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-BoldItalic.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-ExtraBold.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-ExtraBoldItalic.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-Italic.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-Light.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-LightItalic.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-Medium.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-MediumItalic.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-Regular.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-SemiBold.ttf \ + static/OpenSans_Condensed/OpenSans_Condensed-SemiBoldItalic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Bold.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-BoldItalic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-ExtraBold.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-ExtraBoldItalic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Italic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Light.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-LightItalic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Medium.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-MediumItalic.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-Regular.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-SemiBold.ttf \ + static/OpenSans_SemiCondensed/OpenSans_SemiCondensed-SemiBoldItalic.ttf \ + static/OpenSans/OpenSans-Bold.ttf \ + static/OpenSans/OpenSans-BoldItalic.ttf \ + static/OpenSans/OpenSans-ExtraBold.ttf \ + static/OpenSans/OpenSans-ExtraBoldItalic.ttf \ + static/OpenSans/OpenSans-Italic.ttf \ + static/OpenSans/OpenSans-Light.ttf \ + static/OpenSans/OpenSans-LightItalic.ttf \ + static/OpenSans/OpenSans-Medium.ttf \ + static/OpenSans/OpenSans-MediumItalic.ttf \ + static/OpenSans/OpenSans-Regular.ttf \ + static/OpenSans/OpenSans-SemiBold.ttf \ + static/OpenSans/OpenSans-SemiBoldItalic.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 12376636e857..608ae428bf36 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_reem \ ExternalPackage_scheherazade \ ExternalPackage_opendyslexic \ + ExternalPackage_opensans \ UnpackedTarball_alef \ UnpackedTarball_amiri \ UnpackedTarball_caladea \ @@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ UnpackedTarball_opendyslexic \ + UnpackedTarball_opensans \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_opensans.mk b/external/more_fonts/UnpackedTarball_opensans.mk new file mode 100644 index 000000000000..d49884c3b380 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_opensans.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_opensans)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_opensans,$(FONT_OPEN_SANS_TARBALL),0)) + +# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index dace48da93b9..547f1b289ab8 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2689,6 +2689,10 @@ <p>Copyright (c) 12/2012 - 2019</p> <p>This Font Software is licensed under the SIL Open Font License, Version 1.1 as shown below.</p> <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p> + <h2>Open Sans</h2> + <p>Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)</p> + <p>This Font Software is licensed under the SIL Open Font License, Version 1.1 as shown below.</p> + <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p> <h2>Reem Kufi</h2> <p>The following software may be included in this product: Reem Kufi fonts. Use of any of this software is governed by the terms of the license below:</p> |