diff --git a/Makefile.fetch b/Makefile.fetch index 6640b0ade985..5b0fc14c49ce 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -180,6 +180,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ diff --git a/download.lst b/download.lst index a046718e0151..9b702e5d5332 100644 --- a/download.lst +++ b/download.lst @@ -162,6 +162,11 @@ FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_SHA256SUM := efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293 +FONT_NOTO_SANS_TARBALL := NotoSans-v2.012.zip +# three static lines +# so that git cherry-pick +# will not run into conflicts FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index dd52ac956265..20e5ff06b95a 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -23,23 +23,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ - NotoSans-Bold.ttf \ - NotoSans-BoldItalic.ttf \ - NotoSans-Condensed.ttf \ - NotoSans-CondensedBold.ttf \ - NotoSans-CondensedBoldItalic.ttf \ - NotoSans-CondensedItalic.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansHebrew-Bold.ttf \ NotoSansHebrew-Regular.ttf \ - NotoSans-Italic.ttf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ - NotoSans-Light.ttf \ - NotoSans-LightItalic.ttf \ NotoSansLisu-Regular.ttf \ - NotoSans-Regular.ttf \ NotoSerifArmenian-Bold.ttf \ NotoSerifArmenian-Regular.ttf \ NotoSerif-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_sans.mk b/external/more_fonts/ExternalPackage_noto_sans.mk new file mode 100644 index 000000000000..57d13415e88e --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans.mk @@ -0,0 +1,19 @@ +# -*- 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_noto,font_noto_sans)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSans/full/ttf/NotoSans-Bold.ttf \ + NotoSans/full/ttf/NotoSans-BoldItalic.ttf \ + NotoSans/full/ttf/NotoSans-Italic.ttf \ + NotoSans/full/ttf/NotoSans-Regular.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 001e9bcc2d03..0e0349976eb1 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_libertineg \ ExternalPackage_libre_hebrew \ ExternalPackage_noto \ + ExternalPackage_noto_sans \ ExternalPackage_reem \ ExternalPackage_scheherazade \ UnpackedTarball_alef \ @@ -36,6 +37,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_libertineg \ UnpackedTarball_libre_hebrew \ UnpackedTarball_noto \ + UnpackedTarball_noto_sans \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ )) diff --git a/external/more_fonts/UnpackedTarball_noto_sans.mk b/external/more_fonts/UnpackedTarball_noto_sans.mk new file mode 100644 index 000000000000..f09189dbe185 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_sans.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_noto_sans)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_sans,$(FONT_NOTO_SANS_TARBALL),0)) + +# vim: set noet sw=4 ts=4: