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_lao.mk | 17 | ||||
-rw-r--r-- | external/more_fonts/Module_more_fonts.mk | 2 | ||||
-rw-r--r-- | external/more_fonts/UnpackedTarball_noto_serif_lao.mk | 14 |
6 files changed, 39 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 313c8b7a1ec6..7d089de612ed 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -190,6 +190,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_GEORGIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LAO_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_LAO_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 2b98cb8d542a..06a7ac8e2f52 100644 --- a/download.lst +++ b/download.lst @@ -212,6 +212,11 @@ FONT_NOTO_SANS_LAO_TARBALL := NotoSansLao-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SERIF_LAO_SHA256SUM := e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2 +FONT_NOTO_SERIF_LAO_TARBALL := NotoSerifLao-v2.003.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 c0778a06cdf5..f953ec31646a 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -18,8 +18,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ NotoSansLisu-Regular.ttf \ - NotoSerifLao-Bold.ttf \ - NotoSerifLao-Regular.ttf \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_noto_serif_lao.mk b/external/more_fonts/ExternalPackage_noto_serif_lao.mk new file mode 100644 index 000000000000..acb3631feb59 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_serif_lao.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_lao)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSerifLao/full/ttf/NotoSerifLao-Bold.ttf \ + NotoSerifLao/full/ttf/NotoSerifLao-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 3aa9ff01dda3..ac4031bedcf6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_serif_armenian \ ExternalPackage_noto_serif_georgian \ ExternalPackage_noto_serif_hebrew \ + ExternalPackage_noto_serif_lao \ ExternalPackage_reem \ ExternalPackage_scheherazade \ UnpackedTarball_alef \ @@ -56,6 +57,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_serif_armenian \ UnpackedTarball_noto_serif_georgian \ UnpackedTarball_noto_serif_hebrew \ + UnpackedTarball_noto_serif_lao \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ )) diff --git a/external/more_fonts/UnpackedTarball_noto_serif_lao.mk b/external/more_fonts/UnpackedTarball_noto_serif_lao.mk new file mode 100644 index 000000000000..f6de23ed7e3b --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_serif_lao.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_lao)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_serif_lao,$(FONT_NOTO_SERIF_LAO_TARBALL),0)) + +# vim: set noet sw=4 ts=4: |