Makefile.fetch | 3 +++ download.lst | 15 +++++++++++++++ external/more_fonts/ExternalPackage_noto.mk | 5 ----- external/more_fonts/ExternalPackage_noto_sans_lao.mk | 17 +++++++++++++++++ external/more_fonts/ExternalPackage_noto_sans_lisu.mk | 17 +++++++++++++++++ external/more_fonts/ExternalPackage_noto_serif_lao.mk | 17 +++++++++++++++++ external/more_fonts/Module_more_fonts.mk | 6 ++++++ external/more_fonts/UnpackedTarball_noto_sans_lao.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_noto_sans_lisu.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_noto_serif_lao.mk | 14 ++++++++++++++ 10 files changed, 117 insertions(+), 5 deletions(-)
New commits: commit 00db8423d18d75f982b337744ec39c4b7269a433 Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Tue Sep 26 13:15:29 2023 +0300 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Tue Sep 26 22:00:38 2023 +0200 tdf#124591: Update Noto Sans Lisu to v2.102 from: https://github.com/notofonts/lisu/releases/tag/NotoSansLisu-v2.102 Change-Id: I205cf05d6f33e1083e30193d7ed775d9775af2f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157280 Tested-by: Jenkins Reviewed-by: خالد حسني <kha...@libreoffice.org> diff --git a/Makefile.fetch b/Makefile.fetch index 7d089de612ed..c8ea14b3a6bc 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -191,6 +191,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(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_NOTO_SANS_LISU_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 06a7ac8e2f52..b470064253a0 100644 --- a/download.lst +++ b/download.lst @@ -217,6 +217,11 @@ FONT_NOTO_SERIF_LAO_TARBALL := NotoSerifLao-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_LISU_SHA256SUM := b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268 +FONT_NOTO_SANS_LISU_TARBALL := NotoSansLisu-v2.102.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 f953ec31646a..d5bfe4cf8b88 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -17,7 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansLisu-Regular.ttf \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_noto_sans_lisu.mk b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk new file mode 100644 index 000000000000..9200e5698741 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_lisu.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_lisu)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansLisu/full/ttf/NotoSansLisu-Bold.ttf \ + NotoSansLisu/full/ttf/NotoSansLisu-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 ac4031bedcf6..12bcabcc604d 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_sans_georgian \ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_sans_lao \ + ExternalPackage_noto_sans_lisu \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_armenian \ ExternalPackage_noto_serif_georgian \ @@ -53,6 +54,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_sans_georgian \ UnpackedTarball_noto_sans_hebrew \ UnpackedTarball_noto_sans_lao \ + UnpackedTarball_noto_sans_lisu \ UnpackedTarball_noto_serif \ UnpackedTarball_noto_serif_armenian \ UnpackedTarball_noto_serif_georgian \ diff --git a/external/more_fonts/UnpackedTarball_noto_sans_lisu.mk b/external/more_fonts/UnpackedTarball_noto_sans_lisu.mk new file mode 100644 index 000000000000..58729012aeef --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_sans_lisu.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_lisu)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_sans_lisu,$(FONT_NOTO_SANS_LISU_TARBALL),0)) + +# vim: set noet sw=4 ts=4: commit 114b94f7e04daf699dad44857c1a86932f466c46 Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Tue Sep 26 13:07:09 2023 +0300 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Tue Sep 26 22:00:32 2023 +0200 tdf#124591: Update Noto Serif Lao to v2.003 from: https://github.com/notofonts/lao/releases/tag/NotoSerifLao-v2.003 Change-Id: I58b69f3219a7afa7a60a17167cc9d4c4f1d8397b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157279 Tested-by: Jenkins Reviewed-by: خالد حسني <kha...@libreoffice.org> 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: commit c4609a0721b466a805514197cd6872e0dfb07aa6 Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Tue Sep 26 13:02:59 2023 +0300 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Tue Sep 26 22:00:24 2023 +0200 tdf#124591: Update Noto Sans Lao to v2.003 from: https://github.com/notofonts/lao/releases/tag/NotoSansLao-v2.003 Change-Id: I5a857c4f335cf29473b9baeffffddcc6d810e0b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157278 Tested-by: خالد حسني <kha...@libreoffice.org> Reviewed-by: خالد حسني <kha...@libreoffice.org> diff --git a/Makefile.fetch b/Makefile.fetch index 52b272a2f31f..313c8b7a1ec6 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -189,6 +189,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_ARMENIAN_TARBALL) \ $(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_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 b1797173b71f..2b98cb8d542a 100644 --- a/download.lst +++ b/download.lst @@ -207,6 +207,11 @@ FONT_NOTO_SERIF_GEORGIAN_TARBALL := NotoSerifGeorgian-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_LAO_SHA256SUM := 5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0 +FONT_NOTO_SANS_LAO_TARBALL := NotoSansLao-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 76e6dab93ebb..c0778a06cdf5 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 \ - NotoSansLao-Bold.ttf \ - NotoSansLao-Regular.ttf \ NotoSansLisu-Regular.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_sans_lao.mk b/external/more_fonts/ExternalPackage_noto_sans_lao.mk new file mode 100644 index 000000000000..c15dd04c6869 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_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_sans_lao)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansLao/full/ttf/NotoSansLao-Bold.ttf \ + NotoSansLao/full/ttf/NotoSansLao-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 d99dcaf618a6..3aa9ff01dda3 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_georgian \ ExternalPackage_noto_sans_hebrew \ + ExternalPackage_noto_sans_lao \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_armenian \ ExternalPackage_noto_serif_georgian \ @@ -50,6 +51,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_sans_armenian \ UnpackedTarball_noto_sans_georgian \ UnpackedTarball_noto_sans_hebrew \ + UnpackedTarball_noto_sans_lao \ UnpackedTarball_noto_serif \ UnpackedTarball_noto_serif_armenian \ UnpackedTarball_noto_serif_georgian \ diff --git a/external/more_fonts/UnpackedTarball_noto_sans_lao.mk b/external/more_fonts/UnpackedTarball_noto_sans_lao.mk new file mode 100644 index 000000000000..0ab604afad67 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_sans_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_sans_lao)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_sans_lao,$(FONT_NOTO_SANS_LAO_TARBALL),0)) + +# vim: set noet sw=4 ts=4: