diff options
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | download.lst | 5 | ||||
| -rw-r--r-- | external/more_fonts/ExternalPackage_noto.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/ExternalPackage_noto_serif_armenian.mk | 17 | ||||
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/UnpackedTarball_noto_serif_armenian.mk | 14 |
6 files changed, 39 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 3daedcb32695..d7b09fc5fab6 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_NOTO_SANS_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_ARMENIAN_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 f62fedfcddcf..194183f5ad17 100644 --- a/download.lst +++ b/download.lst @@ -192,6 +192,11 @@ FONT_NOTO_SANS_ARMENIAN_TARBALL := NotoSansArmenian-v2.008.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SERIF_ARMENIAN_SHA256SUM := b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f +FONT_NOTO_SERIF_ARMENIAN_TARBALL := NotoSerifArmenian-v2.008.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 514b17933e43..dd84b561af5d 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -22,8 +22,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLisu-Regular.ttf \ - NotoSerifArmenian-Bold.ttf \ - NotoSerifArmenian-Regular.ttf \ NotoSerifGeorgian-Bold.ttf \ NotoSerifGeorgian-Regular.ttf \ NotoSerifLao-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_serif_armenian.mk b/external/more_fonts/ExternalPackage_noto_serif_armenian.mk new file mode 100644 index 000000000000..dbe9a8600154 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_serif_armenian.mk @@ -0,0 +1,17 @@ +# -*- 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_serif_armenian)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSerifArmenian/full/ttf/NotoSerifArmenian-Bold.ttf \ + NotoSerifArmenian/full/ttf/NotoSerifArmenian-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 d5ed948db7ff..ab3c7719ebbe 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_noto_sans_armenian \ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_serif \ + ExternalPackage_noto_serif_armenian \ ExternalPackage_noto_serif_hebrew \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -47,6 +48,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_sans_armenian \ UnpackedTarball_noto_sans_hebrew \ UnpackedTarball_noto_serif \ + UnpackedTarball_noto_serif_armenian \ UnpackedTarball_noto_serif_hebrew \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_noto_serif_armenian.mk b/external/more_fonts/UnpackedTarball_noto_serif_armenian.mk new file mode 100644 index 000000000000..fa9fc1a09801 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_serif_armenian.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_serif_armenian)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_serif_armenian,$(FONT_NOTO_SERIF_ARMENIAN_TARBALL),0)) + +# vim: set noet sw=4 ts=4: |