[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - download.lst external/noto_font Makefile.fetch scp2/source
Andras Timar
andras.timar at collabora.com
Mon Dec 18 09:25:23 UTC 2017
Makefile.fetch | 8 ++
download.lst | 16 +++++
external/noto_font/ExternalPackage_noto.mk | 68 ----------------------
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/Module_noto_font.mk | 16 +++++
external/noto_font/UnpackedTarball_noto.mk | 32 ++++++++++
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 ++++
scp2/source/ooo/file_font_ooo.scp | 8 ++
scp2/source/ooo/module_hidden_ooo.scp | 10 ++-
23 files changed, 337 insertions(+), 69 deletions(-)
New commits:
commit 49cc6bc8300223d9cbb7f1e9444ac7eca44cca92
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun Dec 17 09:12:59 2017 +0100
reduce the size of Noto fonts package (484M->101M)
* do not install UI font variants
* do not install monospaced CJK fonts
* install Region-specific Subset OpenType/CFF (Subset OTF) for CJK
* this is the logical choice on Linux:
see: https://www.google.com/get/noto/help/cjk/
* keep only 2 weights, Regular and Bold for CJK fonts
Change-Id: I292c7a656a55b76a5c07c4fb24529ac36b5bc34b
Reviewed-on: https://gerrit.libreoffice.org/46637
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index c5eabd2d429c..63622b12d9ff 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,6 +225,14 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
, $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL)))
$(foreach item, \
$(call fetch_Optional,NOTO_FONT,FONT_NOTO_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 $@
diff --git a/download.lst b/download.lst
index 39103821c856..dd39b9588b71 100644
--- a/download.lst
+++ b/download.lst
@@ -49,6 +49,22 @@ export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fo
export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
export FONT_NOTO_TARBALL := Noto-hinted.zip
export FONT_NOTO_MD5SUM := 5489f1765afd34a2adfdc04d014762e7
+export FONT_NOTO_SANS_JP_TARBALL := NotoSansJP.zip
+export FONT_NOTO_SANS_JP_MD5SUM := 7f2597c54c292b4c72ffcdc5e6d31e4d
+export FONT_NOTO_SANS_KR_TARBALL := NotoSansKR.zip
+export FONT_NOTO_SANS_KR_MD5SUM := f4eb1a945c9eb92fee2767b6cd31b2fb
+export FONT_NOTO_SANS_SC_TARBALL := NotoSansSC.zip
+export FONT_NOTO_SANS_SC_MD5SUM := 9c158949366651424b904ba2a5938dfe
+export FONT_NOTO_SANS_TC_TARBALL := NotoSansTC.zip
+export FONT_NOTO_SANS_TC_MD5SUM := 8409d9b3c5411fbcb51a6f13326435fa
+export FONT_NOTO_SERIF_JP_TARBALL := NotoSerifJP.zip
+export FONT_NOTO_SERIF_JP_MD5SUM := d0cc719f75a379140b7489b8f0ca36a4
+export FONT_NOTO_SERIF_KR_TARBALL := NotoSerifKR.zip
+export FONT_NOTO_SERIF_KR_MD5SUM := 7d57d811f6995647d6454cce6d6bb097
+export FONT_NOTO_SERIF_SC_TARBALL := NotoSerifSC.zip
+export FONT_NOTO_SERIF_SC_MD5SUM := 179aafc778d3f9b3be2de7cb26e2b140
+export FONT_NOTO_SERIF_TC_TARBALL := NotoSerifTC.zip
+export FONT_NOTO_SERIF_TC_MD5SUM := 6b1b043a3c466055f515d515d1418fdf
export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz
export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
diff --git a/external/noto_font/ExternalPackage_noto.mk b/external/noto_font/ExternalPackage_noto.mk
index 229cf7e66a1a..015b553cc386 100644
--- a/external/noto_font/ExternalPackage_noto.mk
+++ b/external/noto_font/ExternalPackage_noto.mk
@@ -17,8 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoMono-Regular.ttf \
NotoNaskhArabic-Bold.ttf \
NotoNaskhArabic-Regular.ttf \
- NotoNaskhArabicUI-Bold.ttf \
- NotoNaskhArabicUI-Regular.ttf \
NotoNastaliqUrdu-Regular.ttf \
NotoSansArmenian-Bold.ttf \
NotoSansArmenian-Regular.ttf \
@@ -28,8 +26,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansBatak-Regular.ttf \
NotoSansBengali-Bold.ttf \
NotoSansBengali-Regular.ttf \
- NotoSansBengaliUI-Bold.ttf \
- NotoSansBengaliUI-Regular.ttf \
NotoSans-BoldItalic.ttf \
NotoSans-Bold.ttf \
NotoSansBrahmi-Regular.ttf \
@@ -40,42 +36,12 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansCham-Bold.ttf \
NotoSansCham-Regular.ttf \
NotoSansCherokee-Regular.ttf \
- NotoSansCJKjp-Black.otf \
- NotoSansCJKjp-Bold.otf \
- NotoSansCJKjp-DemiLight.otf \
- NotoSansCJKjp-Light.otf \
- NotoSansCJKjp-Medium.otf \
- NotoSansCJKjp-Regular.otf \
- NotoSansCJKjp-Thin.otf \
- NotoSansCJKkr-Black.otf \
- NotoSansCJKkr-Bold.otf \
- NotoSansCJKkr-DemiLight.otf \
- NotoSansCJKkr-Light.otf \
- NotoSansCJKkr-Medium.otf \
- NotoSansCJKkr-Regular.otf \
- NotoSansCJKkr-Thin.otf \
- NotoSansCJKsc-Black.otf \
- NotoSansCJKsc-Bold.otf \
- NotoSansCJKsc-DemiLight.otf \
- NotoSansCJKsc-Light.otf \
- NotoSansCJKsc-Medium.otf \
- NotoSansCJKsc-Regular.otf \
- NotoSansCJKsc-Thin.otf \
- NotoSansCJKtc-Black.otf \
- NotoSansCJKtc-Bold.otf \
- NotoSansCJKtc-DemiLight.otf \
- NotoSansCJKtc-Light.otf \
- NotoSansCJKtc-Medium.otf \
- NotoSansCJKtc-Regular.otf \
- NotoSansCJKtc-Thin.otf \
NotoSansCoptic-Regular.ttf \
NotoSansCuneiform-Regular.ttf \
NotoSansCypriot-Regular.ttf \
NotoSansDeseret-Regular.ttf \
NotoSansDevanagari-Bold.ttf \
NotoSansDevanagari-Regular.ttf \
- NotoSansDevanagariUI-Bold.ttf \
- NotoSansDevanagariUI-Regular.ttf \
NotoSansEgyptianHieroglyphs-Regular.ttf \
NotoSansEthiopic-Bold.ttf \
NotoSansEthiopic-Regular.ttf \
@@ -85,12 +51,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansGothic-Regular.ttf \
NotoSansGujarati-Bold.ttf \
NotoSansGujarati-Regular.ttf \
- NotoSansGujaratiUI-Bold.ttf \
- NotoSansGujaratiUI-Regular.ttf \
NotoSansGurmukhi-Bold.ttf \
NotoSansGurmukhi-Regular.ttf \
- NotoSansGurmukhiUI-Bold.ttf \
- NotoSansGurmukhiUI-Regular.ttf \
NotoSansHanunoo-Regular.ttf \
NotoSansHebrew-Bold.ttf \
NotoSansHebrew-Regular.ttf \
@@ -102,18 +64,12 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansKaithi-Regular.ttf \
NotoSansKannada-Bold.ttf \
NotoSansKannada-Regular.ttf \
- NotoSansKannadaUI-Bold.ttf \
- NotoSansKannadaUI-Regular.ttf \
NotoSansKayahLi-Regular.ttf \
NotoSansKharoshthi-Regular.ttf \
NotoSansKhmer-Bold.ttf \
NotoSansKhmer-Regular.ttf \
- NotoSansKhmerUI-Bold.ttf \
- NotoSansKhmerUI-Regular.ttf \
NotoSansLao-Bold.ttf \
NotoSansLao-Regular.ttf \
- NotoSansLaoUI-Bold.ttf \
- NotoSansLaoUI-Regular.ttf \
NotoSansLepcha-Regular.ttf \
NotoSansLimbu-Regular.ttf \
NotoSansLinearB-Regular.ttf \
@@ -122,23 +78,11 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansLydian-Regular.ttf \
NotoSansMalayalam-Bold.ttf \
NotoSansMalayalam-Regular.ttf \
- NotoSansMalayalamUI-Bold.ttf \
- NotoSansMalayalamUI-Regular.ttf \
NotoSansMandaic-Regular.ttf \
NotoSansMeeteiMayek-Regular.ttf \
NotoSansMongolian-Regular.ttf \
- NotoSansMonoCJKjp-Bold.otf \
- NotoSansMonoCJKjp-Regular.otf \
- NotoSansMonoCJKkr-Bold.otf \
- NotoSansMonoCJKkr-Regular.otf \
- NotoSansMonoCJKsc-Bold.otf \
- NotoSansMonoCJKsc-Regular.otf \
- NotoSansMonoCJKtc-Bold.otf \
- NotoSansMonoCJKtc-Regular.otf \
NotoSansMyanmar-Bold.ttf \
NotoSansMyanmar-Regular.ttf \
- NotoSansMyanmarUI-Bold.ttf \
- NotoSansMyanmarUI-Regular.ttf \
NotoSansNewTaiLue-Regular.ttf \
NotoSansNKo-Regular.ttf \
NotoSansOgham-Regular.ttf \
@@ -149,8 +93,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansOldTurkic-Regular.ttf \
NotoSansOriya-Bold.ttf \
NotoSansOriya-Regular.ttf \
- NotoSansOriyaUI-Bold.ttf \
- NotoSansOriyaUI-Regular.ttf \
NotoSansOsmanya-Regular.ttf \
NotoSansPhagsPa-Regular.ttf \
NotoSansPhoenician-Regular.ttf \
@@ -175,26 +117,16 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansTaiViet-Regular.ttf \
NotoSansTamil-Bold.ttf \
NotoSansTamil-Regular.ttf \
- NotoSansTamilUI-Bold.ttf \
- NotoSansTamilUI-Regular.ttf \
NotoSansTelugu-Bold.ttf \
NotoSansTelugu-Regular.ttf \
- NotoSansTeluguUI-Bold.ttf \
- NotoSansTeluguUI-Regular.ttf \
NotoSansThaana-Bold.ttf \
NotoSansThaana-Regular.ttf \
NotoSansThai-Bold.ttf \
NotoSansThai-Regular.ttf \
- NotoSansThaiUI-Bold.ttf \
- NotoSansThaiUI-Regular.ttf \
NotoSansTibetan-Bold.ttf \
NotoSansTibetan-Regular.ttf \
NotoSansTifinagh-Regular.ttf \
NotoSansUgaritic-Regular.ttf \
- NotoSansUI-BoldItalic.ttf \
- NotoSansUI-Bold.ttf \
- NotoSansUI-Italic.ttf \
- NotoSansUI-Regular.ttf \
NotoSansVai-Regular.ttf \
NotoSansYi-Regular.ttf \
NotoSerifArmenian-Bold.ttf \
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/Module_noto_font.mk b/external/noto_font/Module_noto_font.mk
index a69039e39ccf..d6fbcf8e37a0 100644
--- a/external/noto_font/Module_noto_font.mk
+++ b/external/noto_font/Module_noto_font.mk
@@ -11,7 +11,23 @@ $(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/UnpackedTarball_noto.mk b/external/noto_font/UnpackedTarball_noto.mk
index 440d4dea100f..4473de57591f 100644
--- a/external/noto_font/UnpackedTarball_noto.mk
+++ b/external/noto_font/UnpackedTarball_noto.mk
@@ -11,4 +11,36 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto))
$(eval $(call gb_UnpackedTarball_set_tarball,font_noto,$(FONT_NOTO_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:
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 1be67624a8ac..e3a3dbf9c48d 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -73,6 +73,14 @@ STD_FONT_FILELIST(gid_File_Fnt_Karla, "fonts_karla.filelist")
#ifdef WITH_NOTO_FONT
// Noto fonts
STD_FONT_FILELIST(gid_File_Fnt_Noto, "fonts_noto.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSansJp, "fonts_notosansjp.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSansKr, "fonts_notosanskr.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSansSc, "fonts_notosanssc.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSansTc, "fonts_notosanstc.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSerifJp, "fonts_notoserifjp.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSerifKr, "fonts_notoserifkr.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSerifSc, "fonts_notoserifsc.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_NotoSerifTc, "fonts_notoseriftc.filelist")
#endif
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 457d94fb8eca..418ba6b9a800 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -123,7 +123,15 @@ Module gid_Module_Root_Fonts_Noto_Hidden
Sortkey = "2150";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Fnt_Noto);
+ Files = (gid_File_Fnt_Noto,
+ gid_File_Fnt_NotoSansJp,
+ gid_File_Fnt_NotoSansKr,
+ gid_File_Fnt_NotoSansSc,
+ gid_File_Fnt_NotoSansTc,
+ gid_File_Fnt_NotoSerifJp,
+ gid_File_Fnt_NotoSerifKr,
+ gid_File_Fnt_NotoSerifSc,
+ gid_File_Fnt_NotoSerifTc);
End
#endif
#endif
More information about the Libreoffice-commits
mailing list