Makefile.fetch | 15 +
Repository.mk | 13 +
configure.ac | 18 +
download.lst | 58 +++++
external/Module_external.mk | 1
external/more_fonts/ExternalPackage_karla.mk | 19 +
external/more_fonts/ExternalPackage_opendyslexic.mk | 19 +
external/more_fonts/Module_more_fonts.mk | 4
external/more_fonts/UnpackedTarball_karla.mk | 14 +
external/more_fonts/UnpackedTarball_opendyslexic.mk | 14 +
external/noto_font/ExternalPackage_noto.mk | 134 +++++++++++++
external/noto_font/ExternalPackage_notosansjp.mk | 17 +
external/noto_font/ExternalPackage_notosanskr.mk | 17 +
external/noto_font/ExternalPackage_notosanssc.mk | 17 +
external/noto_font/ExternalPackage_notosanstc.mk | 17 +
external/noto_font/ExternalPackage_notoserifjp.mk | 17 +
external/noto_font/ExternalPackage_notoserifkr.mk | 17 +
external/noto_font/ExternalPackage_notoserifsc.mk | 17 +
external/noto_font/ExternalPackage_notoseriftc.mk | 17 +
external/noto_font/Makefile | 7
external/noto_font/Module_noto_font.mk | 33 +++
external/noto_font/README | 1
external/noto_font/UnpackedTarball_noto.mk | 46 ++++
external/noto_font/UnpackedTarball_notosansjp.mk | 14 +
external/noto_font/UnpackedTarball_notosanskr.mk | 14 +
external/noto_font/UnpackedTarball_notosanssc.mk | 14 +
external/noto_font/UnpackedTarball_notosanstc.mk | 14 +
external/noto_font/UnpackedTarball_notoserifjp.mk | 14 +
external/noto_font/UnpackedTarball_notoserifkr.mk | 14 +
external/noto_font/UnpackedTarball_notoserifsc.mk | 14 +
external/noto_font/UnpackedTarball_notoseriftc.mk | 14 +
officecfg/registry/data/org/openoffice/Office/Common.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
readlicense_oo/license/license.xml | 14 +
sc/source/filter/oox/workbookhelper.cxx | 2
setup_native/source/packinfo/packinfo_brand.txt | 7
setup_native/source/packinfo/packinfo_office.txt | 2
solenv/flatpak-manifest.in | 6
38 files changed, 676 insertions(+), 3 deletions(-)
New commits:
commit b90970f80f6433e00d4d7582288bece775e22853
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Apr 18 12:38:11 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:54:41 2024 +0100
[cp] ViewPDFAfterExport default true
Change-Id: I2c054ba672c7ab52a6e3f3f085823fd5015f0d62
Reviewed-on: https://gerrit.libreoffice.org/75233
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 558711497328..daf3dac31758 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -4609,7 +4609,7 @@
<info>
<desc>Specifies if PDF automatically opens after export.</desc>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="ExportBookmarks" oor:type="xs:boolean"
oor:nillable="false">
<info>
commit d1e13a4f5415db4101e68fcfd687dba46fc0d69a
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Fri Oct 19 20:56:35 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:52:56 2024 +0100
[cp] Add another known good generator.
Change-Id: I05a9aff0d1bddf0efd2491f09fe0fbf7144e8b4d
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 855c7dab40b0..45105946e40a 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -565,7 +565,7 @@ void WorkbookGlobals::initialize()
aCalcConfig.SetStringRefSyntax( formula::FormulaGrammar::CONV_XL_A1 ) ;
mpDoc->SetCalcConfig(aCalcConfig);
}
- else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice"))
+ else if (aGenerator.startsWithIgnoreAsciiCase("LibreOffice") ||
aGenerator.startsWithIgnoreAsciiCase("Collabora"))
{
mbGeneratorKnownGood = true;
}
commit c708f998f2b0de445b22ddd06e387bc4b6056e04
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Oct 2 14:18:26 2015 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:52:10 2024 +0100
[cp] provide libreoffice-writer, libreoffice-calc etc. metapackages
(cherry picked from commit d151f43cdb0e7735d267115868a9dac9f45bb6b2)
(cherry picked from commit ddb987c79a3852cfb552f10b1beca03f419879c2)
Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1
diff --git a/setup_native/source/packinfo/packinfo_brand.txt
b/setup_native/source/packinfo/packinfo_brand.txt
index f8e4de457c66..e71bf660fb60 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -28,6 +28,7 @@ vendor = "The Document Foundation"
description = "Brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice"
End
Start
@@ -42,6 +43,7 @@ vendor = "The Document Foundation"
description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-writer"
End
Start
@@ -56,6 +58,7 @@ vendor = "The Document Foundation"
description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-calc"
End
Start
@@ -70,6 +73,7 @@ vendor = "The Document Foundation"
description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-impress"
End
Start
@@ -84,6 +88,7 @@ vendor = "The Document Foundation"
description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-draw"
End
Start
@@ -98,6 +103,7 @@ vendor = "The Document Foundation"
description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-math"
End
Start
@@ -112,6 +118,7 @@ vendor = "The Document Foundation"
description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-base"
End
Start
diff --git a/setup_native/source/packinfo/packinfo_office.txt
b/setup_native/source/packinfo/packinfo_office.txt
index a92b88a40690..78d93910d772 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -53,6 +53,7 @@ vendor = "The Document Foundation"
description = "GNOME integration module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-evolution libreoffice-gnome"
End
Start
@@ -101,6 +102,7 @@ vendor = "The Document Foundation"
description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
+provides = "libreoffice-common"
End
Start
commit b1439907ff929f9fb57c216b9f4dc50c87ab147b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Jun 18 12:03:22 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:51:48 2024 +0100
[cp] ReleaseNotesURL
Change-Id: Iff5941ffc49be5fe583ee8966d18b5e7277648ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96594
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index de1eae2ce767..07602ca524db 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -349,7 +349,7 @@
<value>https://hub.libreoffice.org/donation/</value>
</prop>
<prop oor:name="ReleaseNotesURL" oor:type="xs:string">
- <value>https://hub.libreoffice.org/ReleaseNotes/</value>
+
<value>https://www.collaboraoffice.com/collabora-office-24.04-release-notes/</value>
</prop>
<prop oor:name="CreditsURL" oor:type="xs:string">
<value>https://hub.libreoffice.org/credits/</value>
commit 573cd6214e34f7151cd56afbe2d3e6ff9bbd272e
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Sep 18 15:42:30 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:50:40 2024 +0100
[cp] Bundle OpenDyslexic font
Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8
Reviewed-on: https://gerrit.libreoffice.org/79099
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 901d20e965ce..6a3f993264fd 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -253,6 +253,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_SC_TARBALL) \
$(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_TC_TARBALL) \
,$(call
fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item)))
+ $(foreach item, \
+ $(call fetch_Optional,MORE_FONTS,FONT_OPENDYSLEXIC_TARBALL) \
+ ,$(call
fetch_Download_item,https://github.com/antijingoist/opendyslexic/releases/download/v0.91.12,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
diff --git a/Repository.mk b/Repository.mk
index 5eb602d19de4..38b0529cde4d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1055,6 +1055,7 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+ fonts_opendyslexic \
fonts_reem \
fonts_scheherazade \
) \
diff --git a/download.lst b/download.lst
index 5f8c1793572b..bf4075fcd7e3 100644
--- a/download.lst
+++ b/download.lst
@@ -315,6 +315,11 @@ FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_OPENDYSLEXIC_SHA256SUM :=
b92d7fcb9409f2bcfd23b65ac71647256eb49c429f4fbb1cc870381fc93eb486
+FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.910.12-rc2-2019.10.17.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
# three static lines
diff --git a/external/more_fonts/ExternalPackage_opendyslexic.mk
b/external/more_fonts/ExternalPackage_opendyslexic.mk
new file mode 100644
index 000000000000..0afaa9bf5be5
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_opendyslexic.mk
@@ -0,0 +1,19 @@
+# -*- 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_opendyslexic,font_opendyslexic))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_opendyslexic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ OpenDyslexic-Bold-Italic.otf \
+ OpenDyslexic-Bold.otf \
+ OpenDyslexic-Italic.otf \
+ OpenDyslexic-Regular.otf \
+))
+
+# 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 09470e1a2e6a..055b7cbc88d6 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto_serif_lao \
ExternalPackage_reem \
ExternalPackage_scheherazade \
+ ExternalPackage_opendyslexic \
UnpackedTarball_alef \
UnpackedTarball_amiri \
UnpackedTarball_caladea \
@@ -66,6 +67,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_noto_serif_lao \
UnpackedTarball_reem \
UnpackedTarball_scheherazade \
+ UnpackedTarball_opendyslexic \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/UnpackedTarball_opendyslexic.mk
b/external/more_fonts/UnpackedTarball_opendyslexic.mk
new file mode 100644
index 000000000000..6a8f513deab8
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_opendyslexic.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_opendyslexic))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_opendyslexic,$(FONT_OPENDYSLEXIC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 986a8e186182..0ba9da322be0 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2666,6 +2666,12 @@
<p>This Font Software is licensed under the SIL Open Font License,
Version 1.1. This license is copied below,
and is also available with a FAQ at: <a
href="http://scripts.sil.org/OFL";>http://scripts.sil.org/OFL</a></p>
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open
Font License, Version 1.1</a></p>
+ <h2>OpenDyslexic</h2>
+ <p>Copyright (c) 2019-07-29, Abbie Gonzalez
(https://abbiecod.es|supp...@abbiecod.es),
+ with Reserved Font Name OpenDyslexic.</p>
+ <p>Copyright (c) 12/2012 - 2019</p>
+ <p>This Font Software is licensed under the SIL Open Font License,
Version 1.1 as shown below.</p>
+ <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open
Font License, Version 1.1</a></p>
<h2>Reem Kufi</h2>
<p>The following software may be included in this product: Reem Kufi
fonts. Use of any of this software is
governed by the terms of the license below:</p>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a8d8b88394a8..54e5808dddb4 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -800,6 +800,12 @@
"dest": "external/tarballs",
"dest-filename": "@OPENSYMBOL_TTF@"
}
+ {
+ "url":
"https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip";,
+ "sha256":
"ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18478f3c2f96ad9d744975f1",
+ "type": "file",
+ "dest-filename":
"external/tarballs/opendyslexic-0.9.10-beta-2019.09.16.zip"
+ }
],
"buildsystem": "simple",
"build-commands": [
commit 9b0928ea25d89faabe5095462ed2d3b11db05d56
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Sep 18 14:24:51 2015 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:50:24 2024 +0100
[cp] Bundle Karla font
(cherry picked from commit 21dc27ab7834fe4d5783a9f4bd412c08cacc26b4)
Change-Id: I666665c801367ff760b14b9f474952e9894b4791
diff --git a/Makefile.fetch b/Makefile.fetch
index 095d11a375e5..901d20e965ce 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -179,6 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_KARLA_TARBALL) \
$(call
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index ac256341e997..5eb602d19de4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1049,6 +1049,7 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
$(if $(MPL_SUBSET),,fonts_culmus) \
fonts_dejavu \
fonts_gentium \
+ fonts_karla \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
diff --git a/download.lst b/download.lst
index 2142a140e932..5f8c1793572b 100644
--- a/download.lst
+++ b/download.lst
@@ -150,8 +150,16 @@ FONT_GENTIUM_TARBALL :=
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_KARLA_SHA256SUM :=
0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba
+FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_LIBERATION_NARROW_SHA256SUM :=
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_LIBERATION_SHA256SUM :=
26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz
# three static lines
diff --git a/external/more_fonts/ExternalPackage_karla.mk
b/external/more_fonts/ExternalPackage_karla.mk
new file mode 100644
index 000000000000..580777e50a0c
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_karla.mk
@@ -0,0 +1,19 @@
+# -*- 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_karla,font_karla))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_karla,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ Karla-Italic.ttf \
+ Karla-Regular.ttf \
+ Karla-BoldItalic.ttf \
+ Karla-Bold.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 e17af9a15141..09470e1a2e6a 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
ExternalPackage_dejavu \
ExternalPackage_gentium \
+ ExternalPackage_karla \
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
@@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
+ UnpackedTarball_karla \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
diff --git a/external/more_fonts/UnpackedTarball_karla.mk
b/external/more_fonts/UnpackedTarball_karla.mk
new file mode 100644
index 000000000000..a65c5bb36801
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_karla.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_karla))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_karla,$(FONT_KARLA_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 5c9dddd3ac3b..986a8e186182 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2528,6 +2528,14 @@
<p>This Font Software is licensed under the SIL Open Font License,
Version 1.1. This license is copied below,
and is also available with a FAQ at: <a
href="http://scripts.sil.org/OFL";>http://scripts.sil.org/OFL</a></p>
<p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open
Font License, Version 1.1</a></p>
+ <h2>Karla</h2>
+ <p>The following software may be included in this product: Karla
fonts. Use of any of this software is governed
+ by the terms of the license below:</p>
+ <p>Copyright (c) 2011, Jonathan Pinhorn
(pinhorn.typedes...@gmail.com), with Reserved Font Names “Karla” and
+ “Karla Tamil”.</p>
+ <p>This Font Software is licensed under the SIL Open Font License,
Version 1.1. This license is copied below,
+ and is also available with a FAQ at: <a
href="http://scripts.sil.org/OFL";>http://scripts.sil.org/OFL</a></p>
+ <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open
Font License, Version 1.1</a></p>
<h2>Liberation</h2>
<p>The following software may be included in this product: Liberation
fonts. Use of any of this software is
governed by the terms of the license below:</p>
commit 361e0da0e8db633b0e37c2a527e5f6c345b9187b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Apr 23 16:41:51 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:50:04 2024 +0100
[cp] Optionally bundle even more Google Noto fonts
Change-Id: I6c08476710ab541ff9b9407f5d874dbb038990df
diff --git a/Makefile.fetch b/Makefile.fetch
index b96cb573c2bf..095d11a375e5 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -241,6 +241,17 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
,$(call
fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
+ $(foreach item, \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_MORE_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_JP_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_KR_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_SC_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_TC_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_JP_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_KR_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_SC_TARBALL) \
+ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_TC_TARBALL) \
+ ,$(call
fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
diff --git a/Repository.mk b/Repository.mk
index d9361db15403..ac256341e997 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1057,6 +1057,17 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_reem \
fonts_scheherazade \
) \
+ $(call gb_Helper_optional,NOTO_FONT,\
+ fonts_notomore \
+ fonts_notosansjp \
+ fonts_notosanskr \
+ fonts_notosanssc \
+ fonts_notosanstc \
+ fonts_notoserifjp \
+ fonts_notoserifkr \
+ fonts_notoserifsc \
+ fonts_notoseriftc \
+ ) \
))
$(eval $(call gb_Helper_register_packages_for_install,ooo_images,\
diff --git a/configure.ac b/configure.ac
index 5511ab5c8371..ac7de31f1152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2182,6 +2182,11 @@ libo_FUZZ_ARG_WITH(fonts,
known to be available on the system then you should use this
option.]),
,)
+AC_ARG_ENABLE(noto-font,
+ AS_HELP_STRING([--enable-noto-font],
+ [Add more Google Noto fonts.]),
+,)
+
AC_ARG_WITH(epm,
AS_HELP_STRING([--with-epm],
[Decides which epm to use. Default is to use the one from the system if
@@ -13609,6 +13614,19 @@ else
fi
AC_SUBST(WITH_FONTS)
+dnl Test whether to include more Google Noto fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include more Google Noto fonts])
+if test "$enable_noto_font" = "" -o "$enable_noto_font" = "no" -o
"$with_fonts" = "no"; then
+ AC_MSG_RESULT([no])
+ WITH_NOTO_FONT=
+else
+ AC_MSG_RESULT([yes])
+ WITH_NOTO_FONT=TRUE
+ BUILD_TYPE="$BUILD_TYPE NOTO_FONT"
+ SCPDEFS="$SCPDEFS -DWITH_NOTO_FONT"
+fi
+AC_SUBST(WITH_NOTO_FONT)
dnl ===================================================================
dnl Test whether to enable online update service
diff --git a/download.lst b/download.lst
index 302e27ce3371..2142a140e932 100644
--- a/download.lst
+++ b/download.lst
@@ -232,6 +232,51 @@ FONT_NOTO_SANS_LISU_TARBALL := NotoSansLisu-v2.102.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
+FONT_NOTO_MORE_SHA256SUM :=
837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae
+FONT_NOTO_MORE_TARBALL := Noto-hinted.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SANS_JP_SHA256SUM :=
6886c5526628c08f1e21a84f4658ab3daf6d0233de8dc54526ccf9f40bfab18e
+export FONT_NOTO_SANS_JP_TARBALL := NotoSansJP.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SANS_KR_SHA256SUM :=
5147b755c29f16f82b706b1c7ff7982894fccbebcf99e6c5fb0d48c315604b98
+FONT_NOTO_SANS_KR_TARBALL := NotoSansKR.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SANS_SC_SHA256SUM :=
bee1af8c0722cfb3eb1b2fa91a7f3dc011dca231c25c8fcd9d9d544699ababf9
+FONT_NOTO_SANS_SC_TARBALL := NotoSansSC.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SANS_TC_SHA256SUM :=
ec9e8a4156593e1b3ff7cff843989f43f114f96eff0b5db9691ef3c2bdefb73e
+FONT_NOTO_SANS_TC_TARBALL := NotoSansTC.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SERIF_JP_SHA256SUM :=
362438901cb871bf84b01ff4734c668dab57b4905f39e5ec76d8b68a7a7b5fa8
+FONT_NOTO_SERIF_JP_TARBALL := NotoSerifJP.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SERIF_KR_SHA256SUM :=
3c0d276fb05aaefbbca808b4f8c7b1520b4b4e7c0be46296d6e8a5e42f559f5c
+FONT_NOTO_SERIF_KR_TARBALL := NotoSerifKR.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SERIF_SC_SHA256SUM :=
00ed5970680a82453619ac5952c5631ea138372bbb0f864d156d91a0fd9c8279
+FONT_NOTO_SERIF_SC_TARBALL := NotoSerifSC.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
+FONT_NOTO_SERIF_TC_SHA256SUM :=
c33e04199f6d69056a6de0ebc5522dbe36e02f145208c71c9a4c803841151ad2
+FONT_NOTO_SERIF_TC_TARBALL := NotoSerifTC.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/Module_external.mk b/external/Module_external.mk
index e60765634ab5..d9dc0be98b0c 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYTHES,mythes) \
+ $(call gb_Helper_optional,NOTO_FONT,noto_font) \
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,OPENLDAP,openldap) \
diff --git a/external/noto_font/ExternalPackage_noto.mk
b/external/noto_font/ExternalPackage_noto.mk
new file mode 100644
index 000000000000..c2b028e6e6a4
--- /dev/null
+++ b/external/noto_font/ExternalPackage_noto.mk
@@ -0,0 +1,134 @@
+# -*- 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_notomore,font_notomore))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notomore,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoColorEmoji.ttf \
+ NotoEmoji-Regular.ttf \
+ NotoNastaliqUrdu-Regular.ttf \
+ NotoSansAvestan-Regular.ttf \
+ NotoSansBalinese-Regular.ttf \
+ NotoSansBamum-Regular.ttf \
+ NotoSansBatak-Regular.ttf \
+ NotoSansBengali-Bold.ttf \
+ NotoSansBengali-Regular.ttf \
+ NotoSansBrahmi-Regular.ttf \
+ NotoSansBuginese-Regular.ttf \
+ NotoSansBuhid-Regular.ttf \
+ NotoSansCanadianAboriginal-Regular.ttf \
+ NotoSansCarian-Regular.ttf \
+ NotoSansCham-Bold.ttf \
+ NotoSansCham-Regular.ttf \
+ NotoSansCherokee-Regular.ttf \
+ NotoSansCoptic-Regular.ttf \
+ NotoSansCuneiform-Regular.ttf \
+ NotoSansCypriot-Regular.ttf \
+ NotoSansDeseret-Regular.ttf \
+ NotoSansDevanagari-Bold.ttf \
+ NotoSansDevanagari-Regular.ttf \
+ NotoSansEgyptianHieroglyphs-Regular.ttf \
+ NotoSansEthiopic-Bold.ttf \
+ NotoSansEthiopic-Regular.ttf \
+ NotoSansGlagolitic-Regular.ttf \
+ NotoSansGothic-Regular.ttf \
+ NotoSansGujarati-Bold.ttf \
+ NotoSansGujarati-Regular.ttf \
+ NotoSansGurmukhi-Bold.ttf \
+ NotoSansGurmukhi-Regular.ttf \
+ NotoSansHanunoo-Regular.ttf \
+ NotoSansImperialAramaic-Regular.ttf \
+ NotoSansInscriptionalPahlavi-Regular.ttf \
+ NotoSansInscriptionalParthian-Regular.ttf \
+ NotoSansJavanese-Regular.ttf \
+ NotoSansKaithi-Regular.ttf \
+ NotoSansKannada-Bold.ttf \
+ NotoSansKannada-Regular.ttf \
+ NotoSansKayahLi-Regular.ttf \
+ NotoSansKharoshthi-Regular.ttf \
+ NotoSansKhmer-Bold.ttf \
+ NotoSansKhmer-Regular.ttf \
+ NotoSansLepcha-Regular.ttf \
+ NotoSansLimbu-Regular.ttf \
+ NotoSansLinearB-Regular.ttf \
+ NotoSansLycian-Regular.ttf \
+ NotoSansLydian-Regular.ttf \
+ NotoSansMalayalam-Bold.ttf \
+ NotoSansMalayalam-Regular.ttf \
+ NotoSansMandaic-Regular.ttf \
+ NotoSansMeeteiMayek-Regular.ttf \
+ NotoSansMongolian-Regular.ttf \
+ NotoSansMyanmar-Bold.ttf \
+ NotoSansMyanmar-Regular.ttf \
+ NotoSansNewTaiLue-Regular.ttf \
+ NotoSansNKo-Regular.ttf \
+ NotoSansOgham-Regular.ttf \
+ NotoSansOlChiki-Regular.ttf \
+ NotoSansOldItalic-Regular.ttf \
+ NotoSansOldPersian-Regular.ttf \
+ NotoSansOldSouthArabian-Regular.ttf \
+ NotoSansOldTurkic-Regular.ttf \
+ NotoSansOriya-Bold.ttf \
+ NotoSansOriya-Regular.ttf \
+ NotoSansOsmanya-Regular.ttf \
+ NotoSansPhagsPa-Regular.ttf \
+ NotoSansPhoenician-Regular.ttf \
+ NotoSansRejang-Regular.ttf \
+ NotoSansRunic-Regular.ttf \
+ NotoSansSamaritan-Regular.ttf \
+ NotoSansSaurashtra-Regular.ttf \
+ NotoSansShavian-Regular.ttf \
+ NotoSansSinhala-Bold.ttf \
+ NotoSansSinhala-Regular.ttf \
+ NotoSansSundanese-Regular.ttf \
+ NotoSansSylotiNagri-Regular.ttf \
+ NotoSansSymbols-Regular.ttf \
+ NotoSansSyriacEastern-Regular.ttf \
+ NotoSansSyriacEstrangela-Regular.ttf \
+ NotoSansSyriacWestern-Regular.ttf \
+ NotoSansTagalog-Regular.ttf \
+ NotoSansTagbanwa-Regular.ttf \
+ NotoSansTaiLe-Regular.ttf \
+ NotoSansTaiTham-Regular.ttf \
+ NotoSansTaiViet-Regular.ttf \
+ NotoSansTamil-Bold.ttf \
+ NotoSansTamil-Regular.ttf \
+ NotoSansTelugu-Bold.ttf \
+ NotoSansTelugu-Regular.ttf \
+ NotoSansThaana-Bold.ttf \
+ NotoSansThaana-Regular.ttf \
+ NotoSansThai-Bold.ttf \
+ NotoSansThai-Regular.ttf \
+ NotoSansTibetan-Bold.ttf \
+ NotoSansTibetan-Regular.ttf \
+ NotoSansTifinagh-Regular.ttf \
+ NotoSansUgaritic-Regular.ttf \
+ NotoSansVai-Regular.ttf \
+ NotoSansYi-Regular.ttf \
+ NotoSerifBengali-Bold.ttf \
+ NotoSerifBengali-Regular.ttf \
+ NotoSerifDevanagari-Bold.ttf \
+ NotoSerifDevanagari-Regular.ttf \
+ NotoSerifGujarati-Bold.ttf \
+ NotoSerifGujarati-Regular.ttf \
+ NotoSerifKannada-Bold.ttf \
+ NotoSerifKannada-Regular.ttf \
+ NotoSerifKhmer-Bold.ttf \
+ NotoSerifKhmer-Regular.ttf \
+ NotoSerifMalayalam-Bold.ttf \
+ NotoSerifMalayalam-Regular.ttf \
+ NotoSerifTamil-Bold.ttf \
+ NotoSerifTamil-Regular.ttf \
+ NotoSerifTelugu-Bold.ttf \
+ NotoSerifTelugu-Regular.ttf \
+ NotoSerifThai-Bold.ttf \
+ NotoSerifThai-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notosansjp.mk
b/external/noto_font/ExternalPackage_notosansjp.mk
new file mode 100644
index 000000000000..6ea62377932c
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notosansjp.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_notosansjp,font_notosansjp))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notosansjp,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansJP-Bold.otf \
+ NotoSansJP-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notosanskr.mk
b/external/noto_font/ExternalPackage_notosanskr.mk
new file mode 100644
index 000000000000..3669605ad336
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notosanskr.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_notosanskr,font_notosanskr))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notosanskr,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansKR-Bold.otf \
+ NotoSansKR-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notosanssc.mk
b/external/noto_font/ExternalPackage_notosanssc.mk
new file mode 100644
index 000000000000..5e03db1574d3
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notosanssc.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_notosanssc,font_notosanssc))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notosanssc,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansSC-Bold.otf \
+ NotoSansSC-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notosanstc.mk
b/external/noto_font/ExternalPackage_notosanstc.mk
new file mode 100644
index 000000000000..d230d7b07115
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notosanstc.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_notosanstc,font_notosanstc))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notosanstc,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSansTC-Bold.otf \
+ NotoSansTC-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notoserifjp.mk
b/external/noto_font/ExternalPackage_notoserifjp.mk
new file mode 100644
index 000000000000..2b9502c74849
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notoserifjp.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_notoserifjp,font_notoserifjp))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notoserifjp,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerifJP-Bold.otf \
+ NotoSerifJP-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notoserifkr.mk
b/external/noto_font/ExternalPackage_notoserifkr.mk
new file mode 100644
index 000000000000..84b893537ac9
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notoserifkr.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_notoserifkr,font_notoserifkr))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notoserifkr,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerifKR-Bold.otf \
+ NotoSerifKR-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notoserifsc.mk
b/external/noto_font/ExternalPackage_notoserifsc.mk
new file mode 100644
index 000000000000..73e2af1217f3
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notoserifsc.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_notoserifsc,font_notoserifsc))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notoserifsc,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerifSC-Bold.otf \
+ NotoSerifSC-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/ExternalPackage_notoseriftc.mk
b/external/noto_font/ExternalPackage_notoseriftc.mk
new file mode 100644
index 000000000000..0e74e6c97bff
--- /dev/null
+++ b/external/noto_font/ExternalPackage_notoseriftc.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_notoseriftc,font_notoseriftc))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_notoseriftc,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ NotoSerifTC-Bold.otf \
+ NotoSerifTC-Regular.otf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/Makefile b/external/noto_font/Makefile
new file mode 100644
index 000000000000..e4968cf85fb6
--- /dev/null
+++ b/external/noto_font/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/Module_noto_font.mk
b/external/noto_font/Module_noto_font.mk
new file mode 100644
index 000000000000..d6fbcf8e37a0
--- /dev/null
+++ b/external/noto_font/Module_noto_font.mk
@@ -0,0 +1,33 @@
+# -*- 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_Module_Module,noto_font))
+
+$(eval $(call gb_Module_add_targets,noto_font,\
+ ExternalPackage_noto \
+ ExternalPackage_notosansjp \
+ ExternalPackage_notosanskr \
+ ExternalPackage_notosanssc \
+ ExternalPackage_notosanstc \
+ ExternalPackage_notoserifjp \
+ ExternalPackage_notoserifkr \
+ ExternalPackage_notoserifsc \
+ ExternalPackage_notoseriftc \
+ UnpackedTarball_noto \
+ UnpackedTarball_notosansjp \
+ UnpackedTarball_notosanskr \
+ UnpackedTarball_notosanssc \
+ UnpackedTarball_notosanstc \
+ UnpackedTarball_notoserifjp \
+ UnpackedTarball_notoserifkr \
+ UnpackedTarball_notoserifsc \
+ UnpackedTarball_notoseriftc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/README b/external/noto_font/README
new file mode 100644
index 000000000000..96377c3d86e5
--- /dev/null
+++ b/external/noto_font/README
@@ -0,0 +1 @@
+This module packages Google Noto fonts.
diff --git a/external/noto_font/UnpackedTarball_noto.mk
b/external/noto_font/UnpackedTarball_noto.mk
new file mode 100644
index 000000000000..6202fbb59468
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_noto.mk
@@ -0,0 +1,46 @@
+# -*- 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_notomore))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notomore,$(FONT_NOTO_MORE_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notosansjp))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosansjp,$(FONT_NOTO_SANS_JP_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notosanskr))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanskr,$(FONT_NOTO_SANS_KR_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notosanssc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanssc,$(FONT_NOTO_SANS_SC_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notosanstc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanstc,$(FONT_NOTO_SANS_TC_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notoserifjp))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifjp,$(FONT_NOTO_SERIF_JP_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notoserifkr))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifkr,$(FONT_NOTO_SERIF_KR_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notoserifsc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifsc,$(FONT_NOTO_SERIF_SC_TARBALL),0))
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_notoseriftc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoseriftc,$(FONT_NOTO_SERIF_TC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notosansjp.mk
b/external/noto_font/UnpackedTarball_notosansjp.mk
new file mode 100644
index 000000000000..ed4b2275f71e
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notosansjp.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_notosansjp))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosansjp,$(FONT_NOTO_SANS_JP_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notosanskr.mk
b/external/noto_font/UnpackedTarball_notosanskr.mk
new file mode 100644
index 000000000000..0af2842bfb4f
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notosanskr.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_notosanskr))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanskr,$(FONT_NOTO_SANS_KR_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notosanssc.mk
b/external/noto_font/UnpackedTarball_notosanssc.mk
new file mode 100644
index 000000000000..0e15ef6fc8e0
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notosanssc.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_notosanssc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanssc,$(FONT_NOTO_SANS_SC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notosanstc.mk
b/external/noto_font/UnpackedTarball_notosanstc.mk
new file mode 100644
index 000000000000..702f04f79960
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notosanstc.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_notosanstc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notosanstc,$(FONT_NOTO_SANS_TC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notoserifjp.mk
b/external/noto_font/UnpackedTarball_notoserifjp.mk
new file mode 100644
index 000000000000..44909731b26a
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notoserifjp.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_notoserifjp))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifjp,$(FONT_NOTO_SERIF_JP_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notoserifkr.mk
b/external/noto_font/UnpackedTarball_notoserifkr.mk
new file mode 100644
index 000000000000..dcc9ae8b7df8
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notoserifkr.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_notoserifkr))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifkr,$(FONT_NOTO_SERIF_KR_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notoserifsc.mk
b/external/noto_font/UnpackedTarball_notoserifsc.mk
new file mode 100644
index 000000000000..2564a414300c
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notoserifsc.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_notoserifsc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoserifsc,$(FONT_NOTO_SERIF_SC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/UnpackedTarball_notoseriftc.mk
b/external/noto_font/UnpackedTarball_notoseriftc.mk
new file mode 100644
index 000000000000..5d960ab6057b
--- /dev/null
+++ b/external/noto_font/UnpackedTarball_notoseriftc.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_notoseriftc))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,font_notoseriftc,$(FONT_NOTO_SERIF_TC_TARBALL),0))
+
+# vim: set noet sw=4 ts=4:
