Makefile.fetch | 3 ++
download.lst | 15 +++++++++++
external/more_fonts/ExternalPackage_noto.mk | 6 ----
external/more_fonts/ExternalPackage_noto_sans_georgian.mk | 17 +++++++++++++
external/more_fonts/ExternalPackage_noto_serif_armenian.mk | 17 +++++++++++++
external/more_fonts/ExternalPackage_noto_serif_georgian.mk | 17 +++++++++++++
external/more_fonts/Module_more_fonts.mk | 6 ++++
external/more_fonts/UnpackedTarball_noto_sans_georgian.mk | 14 ++++++++++
external/more_fonts/UnpackedTarball_noto_serif_armenian.mk | 14 ++++++++++
external/more_fonts/UnpackedTarball_noto_serif_georgian.mk | 14 ++++++++++
10 files changed, 117 insertions(+), 6 deletions(-)
New commits:
commit 0d49ac1ba30e2cb6247a77e75383176a4624adfd
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 12:56:53 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:54:19 2023 +0200
tdf#124591: Update Noto Serif Georgian to v2.003
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: خالد حسني <kha...@libreoffice.org>
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:
commit 529ddd57c673f49a334b0813f979e7c88db2f46b
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 12:50:18 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:54:14 2023 +0200
tdf#124591: Update Noto Sans Georgian to v2.003
from:
https://github.com/notofonts/georgian/releases/tag/NotoSansGeorgian-v2.003
Change-Id: I007a55194fe77d07c05c704a69c36e489ca5db46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157276
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index d7b09fc5fab6..6f1e8a8b4bdc 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -187,6 +187,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(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_NOTO_SERIF_ARMENIAN_TARBALL) \
+ $(call
fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_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 194183f5ad17..d89d86fbe62f 100644
--- a/download.lst
+++ b/download.lst
@@ -197,6 +197,11 @@ FONT_NOTO_SERIF_ARMENIAN_TARBALL :=
NotoSerifArmenian-v2.008.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_SANS_GEORGIAN_SHA256SUM :=
bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf
+FONT_NOTO_SANS_GEORGIAN_TARBALL := NotoSansGeorgian-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 dd84b561af5d..3b622aa65114 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 \
- NotoSansGeorgian-Bold.ttf \
- NotoSansGeorgian-Regular.ttf \
NotoSansLao-Bold.ttf \
NotoSansLao-Regular.ttf \
NotoSansLisu-Regular.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
b/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
new file mode 100644
index 000000000000..fbe526b2f88c
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans_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_sans_georgian))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansGeorgian/full/ttf/NotoSansGeorgian-Bold.ttf \
+ NotoSansGeorgian/full/ttf/NotoSansGeorgian-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 ab3c7719ebbe..00f65930408f 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto_sans \
ExternalPackage_noto_sans_arabic \
ExternalPackage_noto_sans_armenian \
+ ExternalPackage_noto_sans_georgian \
ExternalPackage_noto_sans_hebrew \
ExternalPackage_noto_serif \
ExternalPackage_noto_serif_armenian \
@@ -46,6 +47,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_noto_sans \
UnpackedTarball_noto_sans_arabic \
UnpackedTarball_noto_sans_armenian \
+ UnpackedTarball_noto_sans_georgian \
UnpackedTarball_noto_sans_hebrew \
UnpackedTarball_noto_serif \
UnpackedTarball_noto_serif_armenian \
diff --git a/external/more_fonts/UnpackedTarball_noto_sans_georgian.mk
b/external/more_fonts/UnpackedTarball_noto_sans_georgian.mk
new file mode 100644
index 000000000000..b5b59184bcf2
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_sans_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_sans_georgian))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_sans_georgian,$(FONT_NOTO_SANS_GEORGIAN_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
commit 15f234bab54c990f3d5362b89afc097f82718e9b
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 26 12:34:35 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 26 21:54:06 2023 +0200
tdf#124591: Update Noto Serif Armenian to v2.008
from:
https://github.com/notofonts/armenian/releases/tag/NotoSerifArmenian-v2.008
Change-Id: If956e731eaa484b9d48c95cab707d77d39aaeeff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157275
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 3daedcb32695..d7b09fc5fab6 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -186,6 +186,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(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_NOTO_SERIF_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 f62fedfcddcf..194183f5ad17 100644
--- a/download.lst
+++ b/download.lst
@@ -192,6 +192,11 @@ FONT_NOTO_SANS_ARMENIAN_TARBALL :=
NotoSansArmenian-v2.008.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_SERIF_ARMENIAN_SHA256SUM :=
b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f
+FONT_NOTO_SERIF_ARMENIAN_TARBALL := NotoSerifArmenian-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 514b17933e43..dd84b561af5d 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -22,8 +22,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansLao-Bold.ttf \
NotoSansLao-Regular.ttf \
NotoSansLisu-Regular.ttf \
- NotoSerifArmenian-Bold.ttf \
- NotoSerifArmenian-Regular.ttf \
NotoSerifGeorgian-Bold.ttf \
NotoSerifGeorgian-Regular.ttf \
NotoSerifLao-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
b/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
new file mode 100644
index 000000000000..dbe9a8600154
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_serif_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_serif_armenian))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerifArmenian/full/ttf/NotoSerifArmenian-Bold.ttf \
+ NotoSerifArmenian/full/ttf/NotoSerifArmenian-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 d5ed948db7ff..ab3c7719ebbe 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_hebrew \
ExternalPackage_noto_serif \
+ ExternalPackage_noto_serif_armenian \
ExternalPackage_noto_serif_hebrew \
ExternalPackage_reem \
ExternalPackage_scheherazade \
@@ -47,6 +48,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_noto_sans_armenian \
UnpackedTarball_noto_sans_hebrew \
UnpackedTarball_noto_serif \
+ UnpackedTarball_noto_serif_armenian \
UnpackedTarball_noto_serif_hebrew \
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
diff --git a/external/more_fonts/UnpackedTarball_noto_serif_armenian.mk
b/external/more_fonts/UnpackedTarball_noto_serif_armenian.mk
new file mode 100644
index 000000000000..fa9fc1a09801
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto_serif_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_serif_armenian))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_noto_serif_armenian,$(FONT_NOTO_SERIF_ARMENIAN_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
