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_sans_armenian.mk | 17 | ||||
| -rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
| -rw-r--r-- | external/more_fonts/UnpackedTarball_noto_sans_armenian.mk | 14 |
6 files changed, 39 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 1f7306941de6..3daedcb32695 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -185,6 +185,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) \ $(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_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 1a3a1f2e0af3..f62fedfcddcf 100644 --- a/download.lst +++ b/download.lst @@ -187,6 +187,11 @@ FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_ARMENIAN_SHA256SUM := eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac +FONT_NOTO_SANS_ARMENIAN_TARBALL := NotoSansArmenian-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 dfb3b170e187..514b17933e43 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -17,8 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansArmenian-Bold.ttf \ - NotoSansArmenian-Regular.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansLao-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_sans_armenian.mk b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk new file mode 100644 index 000000000000..d6b7a12753c2 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_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_sans_armenian)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansArmenian/full/ttf/NotoSansArmenian-Bold.ttf \ + NotoSansArmenian/full/ttf/NotoSansArmenian-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 464b8ab74142..d5ed948db7ff 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_noto \ ExternalPackage_noto_sans \ ExternalPackage_noto_sans_arabic \ + ExternalPackage_noto_sans_armenian \ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_hebrew \ @@ -43,6 +44,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto \ UnpackedTarball_noto_sans \ UnpackedTarball_noto_sans_arabic \ + UnpackedTarball_noto_sans_armenian \ UnpackedTarball_noto_sans_hebrew \ UnpackedTarball_noto_serif \ UnpackedTarball_noto_serif_hebrew \ diff --git a/external/more_fonts/UnpackedTarball_noto_sans_armenian.mk b/external/more_fonts/UnpackedTarball_noto_sans_armenian.mk new file mode 100644 index 000000000000..90632c088797 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_sans_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_sans_armenian)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_sans_armenian,$(FONT_NOTO_SANS_ARMENIAN_TARBALL),0)) + +# vim: set noet sw=4 ts=4: |