diff options
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/more_fonts/ExternalPackage_sourceserif.mk | 27 | ||||
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/UnpackedTarball_sourceserif.mk | 14 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
7 files changed, 53 insertions, 0 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 59aadccaffe3..3f8250a98cb0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -177,6 +177,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(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_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 56174af8ef07..5f62c277b33d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -982,6 +982,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_sourceserif \ fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 3532e2be3aa3..ac11b65846f6 100644 --- a/download.lst +++ b/download.lst @@ -66,6 +66,8 @@ export FONT_SOURCECODE_SHA256SUM := 09466dce87653333f189acd8358c60c6736dcd95f042 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 := 10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb +export FONT_SOURCESERIF_TARBALL := source-serif-font-2.007R.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 diff --git a/external/more_fonts/ExternalPackage_sourceserif.mk b/external/more_fonts/ExternalPackage_sourceserif.mk new file mode 100644 index 000000000000..6a5272bbaa7a --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourceserif.mk @@ -0,0 +1,27 @@ +# -*- 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 c6944cb6264e..c3d5631ae689 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_libre_hebrew \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ + ExternalPackage_sourceserif \ ExternalPackage_noto \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -42,6 +43,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_libre_hebrew \ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ + UnpackedTarball_sourceserif \ UnpackedTarball_noto \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_sourceserif.mk b/external/more_fonts/UnpackedTarball_sourceserif.mk new file mode 100644 index 000000000000..0e8407320733 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_sourceserif.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_sourceserif)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_sourceserif,$(FONT_SOURCESERIF_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 3596916c79c7..8964111edf8d 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -162,6 +162,12 @@ "dest-filename": "external/tarballs/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz" }, { + "url": "https://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz", + "sha256": "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb", + "type": "file", + "dest-filename": "external/tarballs/source-serif-font-2.007R.tar.gz" + }, + { "url": "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz", "sha256": "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7", "type": "file", |