From 0d49ac1ba30e2cb6247a77e75383176a4624adfd Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 26 Sep 2023 12:56:53 +0300 Subject: [PATCH] tdf#124591: Update Noto Serif Georgian to v2.003 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit from: https://github.com/notofonts/georgian/releases/tag/NotoSerifGeorgian-v2.003 Change-Id: I230b8eed49f024e2361e27df963424d7113e52fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157277 Tested-by: Jenkins Reviewed-by: خالد حسني --- Makefile.fetch | 1 + download.lst | 5 +++++ external/more_fonts/ExternalPackage_noto.mk | 2 -- .../ExternalPackage_noto_serif_georgian.mk | 17 +++++++++++++++++ external/more_fonts/Module_more_fonts.mk | 2 ++ .../UnpackedTarball_noto_serif_georgian.mk | 14 ++++++++++++++ 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 external/more_fonts/ExternalPackage_noto_serif_georgian.mk create mode 100644 external/more_fonts/UnpackedTarball_noto_serif_georgian.mk diff --git a/Makefile.fetch b/Makefile.fetch index 6f1e8a8b4bdc..52b272a2f31f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -188,6 +188,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(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_NOTO_SANS_GEORGIAN_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_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 d89d86fbe62f..b1797173b71f 100644 --- a/download.lst +++ b/download.lst @@ -202,6 +202,11 @@ FONT_NOTO_SANS_GEORGIAN_TARBALL := NotoSansGeorgian-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SERIF_GEORGIAN_SHA256SUM := cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4 +FONT_NOTO_SERIF_GEORGIAN_TARBALL := NotoSerifGeorgian-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 3b622aa65114..76e6dab93ebb 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -20,8 +20,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLisu-Regular.ttf \ - NotoSerifGeorgian-Bold.ttf \ - NotoSerifGeorgian-Regular.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ )) diff --git a/external/more_fonts/ExternalPackage_noto_serif_georgian.mk b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk new file mode 100644 index 000000000000..8210e620bbc8 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_serif_georgian.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_georgian)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Bold.ttf \ + NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-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 00f65930408f..d99dcaf618a6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_armenian \ + ExternalPackage_noto_serif_georgian \ ExternalPackage_noto_serif_hebrew \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -51,6 +52,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_sans_hebrew \ UnpackedTarball_noto_serif \ UnpackedTarball_noto_serif_armenian \ + UnpackedTarball_noto_serif_georgian \ UnpackedTarball_noto_serif_hebrew \ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ diff --git a/external/more_fonts/UnpackedTarball_noto_serif_georgian.mk b/external/more_fonts/UnpackedTarball_noto_serif_georgian.mk new file mode 100644 index 000000000000..192e37ed68bf --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto_serif_georgian.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_georgian)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto_serif_georgian,$(FONT_NOTO_SERIF_GEORGIAN_TARBALL),0)) + +# vim: set noet sw=4 ts=4: