From 70e2876a45473ad75d133c9209e3aff943f40113 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Mon, 23 Apr 2018 16:41:51 +0200
Subject: [PATCH] [cp] Optionally bundle even more Google Noto fonts

Change-Id: I6c08476710ab541ff9b9407f5d874dbb038990df
---
 Makefile.fetch                                    |  11 ++
 Repository.mk                                     |  11 ++
 configure.ac                                      |  18 +++
 download.lst                                      |  45 ++++++++
 external/Module_external.mk                       |   1 +
 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 +++
 26 files changed, 555 insertions(+)
 create mode 100644 external/noto_font/ExternalPackage_noto.mk
 create mode 100644 external/noto_font/ExternalPackage_notosansjp.mk
 create mode 100644 external/noto_font/ExternalPackage_notosanskr.mk
 create mode 100644 external/noto_font/ExternalPackage_notosanssc.mk
 create mode 100644 external/noto_font/ExternalPackage_notosanstc.mk
 create mode 100644 external/noto_font/ExternalPackage_notoserifjp.mk
 create mode 100644 external/noto_font/ExternalPackage_notoserifkr.mk
 create mode 100644 external/noto_font/ExternalPackage_notoserifsc.mk
 create mode 100644 external/noto_font/ExternalPackage_notoseriftc.mk
 create mode 100644 external/noto_font/Makefile
 create mode 100644 external/noto_font/Module_noto_font.mk
 create mode 100644 external/noto_font/README
 create mode 100644 external/noto_font/UnpackedTarball_noto.mk
 create mode 100644 external/noto_font/UnpackedTarball_notosansjp.mk
 create mode 100644 external/noto_font/UnpackedTarball_notosanskr.mk
 create mode 100644 external/noto_font/UnpackedTarball_notosanssc.mk
 create mode 100644 external/noto_font/UnpackedTarball_notosanstc.mk
 create mode 100644 external/noto_font/UnpackedTarball_notoserifjp.mk
 create mode 100644 external/noto_font/UnpackedTarball_notoserifkr.mk
 create mode 100644 external/noto_font/UnpackedTarball_notoserifsc.mk
 create mode 100644 external/noto_font/UnpackedTarball_notoseriftc.mk

diff --git a/Makefile.fetch b/Makefile.fetch
index 053cb3190a49..ff496596aeed 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -223,6 +223,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 a5055347d73a..33832cd8195e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1050,6 +1050,17 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 		fonts_sourcesans \
 		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 e8c11fd1bdaa..d42e5d508bb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2146,6 +2146,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
@@ -13337,6 +13342,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 eb47d84258e5..cd9f5ccf426b 100644
--- a/download.lst
+++ b/download.lst
@@ -163,6 +163,51 @@ FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
 # 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 73d6530ac10f..400f5525e3fa 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -76,6 +76,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:
-- 
2.11.4.GIT