diff options
-rw-r--r-- | Makefile.fetch | 1 | ||||
-rw-r--r-- | download.lst | 5 | ||||
-rw-r--r-- | external/more_fonts/ExternalPackage_noto.mk | 4 | ||||
-rw-r--r-- | external/more_fonts/ExternalPackage_noto_sans_arabic.mk | 17 | ||||
-rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
-rw-r--r-- | external/more_fonts/UnpackedTarball_noto_sans_arabic.mk | 14 |
6 files changed, 39 insertions, 4 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 829323fa8496..efb24f1b1280 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -182,6 +182,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_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 4aec2aed751b..1de6ee0cb02c 100644 --- a/download.lst +++ b/download.lst @@ -172,6 +172,11 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_ARABIC_SHA256SUM := a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2 +FONT_NOTO_SANS_ARABIC_TARBALL := NotoSansArabic-v2.010.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 1b66ef631857..14af61b6221a 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -17,10 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansArabic-Bold.ttf \ - NotoSansArabic-Regular.ttf \ - NotoSansArabicUI-Bold.ttf \ - NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ NotoSansGeorgian-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_sans_arabic.mk b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk new file mode 100644 index 000000000000..259167b72673 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_arabic.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_arabic)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansArabic/full/ttf/NotoSansArabic-Bold.ttf \ + NotoSansArabic/full/ttf/NotoSansArabic-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 9114dd7ae7b5..335a2bc6c3af 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_libre_hebrew \ ExternalPackage_noto \ ExternalPackage_noto_sans \ + ExternalPackage_noto_sans_arabic \ ExternalPackage_noto_serif \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_libre_hebrew \ UnpackedTarball_noto \ UnpackedTarball_noto_sans \ + UnpackedTarball_noto_sans_arabic \ UnpackedTarball_noto_serif \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_noto_sans_arabic.mk b/external/more_fonts/UnpackedTarball_noto_sans_arabic.mk new file mode 100644 index 000000000000..b5c4e9f9ed4b --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_sans_arabic.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_arabic)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_sans_arabic,$(FONT_NOTO_SANS_ARABIC_TARBALL),0)) + +# vim: set noet sw=4 ts=4: |