[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk

Yousuf Philips philipz85 at hotmail.com
Fri Nov 10 18:52:51 UTC 2017 

 Makefile.fetch                              |    1 
 Repository.mk                               |    1 
 download.lst                                |    2 +
 external/more_fonts/ExternalPackage_noto.mk |   45 ++++++++++++++++++++++++++++
 external/more_fonts/Module_more_fonts.mk    |    2 +
 external/more_fonts/UnpackedTarball_noto.mk |   14 ++++++++
 6 files changed, 65 insertions(+)

New commits:
commit b97e713e76c88141d26f6e19a74db80a105cb911
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Oct 31 21:48:27 2017 +0400

    tdf#103080 Add Noto fonts into default installation
    
    Includes the regular, italic, bold and bold italic for
    * Noto Sans, Noto Serif
    
    Includes the regular and bold for
    
    * Noto Kufi Arabic, Noto Naskh Arabic
    * Noto Sans Armenian, Noto Serif Armenian
    * Noto Sans Georgian, Noto Serif Georgian
    * Noto Sans Hebrew, Noto Serif Hebrew
    * Noto Sans Lao, Noto Serif Lao
    
    Includes the regular and bold for
    
    * Noto Mono
    * Noto Sans Lisu
    
    Change-Id: I2a423b7cac031e2e899df22ad902bd09d1da250d
    Reviewed-on: https://gerrit.libreoffice.org/44128
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/Makefile.fetch b/Makefile.fetch
index 17780cb2fd4c..3944ac75c7b2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
 		$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
 		$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
+		$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
 		$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
 		$(call fetch_Optional,MWAW,MWAW_TARBALL) \
 		$(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 7fbc1343ccf6..77608e4790af 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -954,6 +954,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 		fonts_liberation \
 		fonts_liberation_narrow \
 		fonts_libertineg \
+		fonts_noto \
 		fonts_opensans \
 		fonts_ptserif \
 		fonts_sourcecode \
diff --git a/download.lst b/download.lst
index 80f5c2cc5650..8dc80d3af2a6 100644
--- a/download.lst
+++ b/download.lst
@@ -72,6 +72,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc
 export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
 export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
+export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8
+export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz
 export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk
new file mode 100644
index 000000000000..adbb88fd4f6d
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+	NotoKufiArabic-Bold.ttf \
+	NotoKufiArabic-Regular.ttf \
+	NotoMono-Regular.ttf \
+	NotoNaskhArabic-Bold.ttf \
+	NotoNaskhArabic-Regular.ttf \
+	NotoSansArmenian-Bold.ttf \
+	NotoSansArmenian-Regular.ttf \
+	NotoSans-Bold.ttf \
+	NotoSans-BoldItalic.ttf \
+	NotoSansGeorgian-Bold.ttf \
+	NotoSansGeorgian-Regular.ttf \
+	NotoSansHebrew-Bold.ttf \
+	NotoSansHebrew-Regular.ttf \
+	NotoSans-Italic.ttf \
+	NotoSansLao-Bold.ttf \
+	NotoSansLao-Regular.ttf \
+	NotoSansLisu-Regular.ttf \
+	NotoSans-Regular.ttf \
+	NotoSerifArmenian-Bold.ttf \
+	NotoSerifArmenian-Regular.ttf \
+	NotoSerif-Bold.ttf \
+	NotoSerif-BoldItalic.ttf \
+	NotoSerifGeorgian-Bold.ttf \
+	NotoSerifGeorgian-Regular.ttf \
+	NotoSerifHebrew-Bold.ttf \
+	NotoSerifHebrew-Regular.ttf \
+	NotoSerif-Italic.ttf \
+	NotoSerifLao-Bold.ttf \
+	NotoSerifLao-Regular.ttf \
+	NotoSerif-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index 6e5224752fe6..bc148d83079a 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	ExternalPackage_ptserif \
 	ExternalPackage_sourcecode \
 	ExternalPackage_sourcesans \
+	ExternalPackage_noto \
 	ExternalPackage_EmojiOne_Color \
 	UnpackedTarball_caladea \
 	UnpackedTarball_carlito \
@@ -33,6 +34,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
 	UnpackedTarball_ptserif \
 	UnpackedTarball_sourcecode \
 	UnpackedTarball_sourcesans \
+	UnpackedTarball_noto \
 	UnpackedTarball_EmojiOne_Color \
 ))
 
diff --git a/external/more_fonts/UnpackedTarball_noto.mk b/external/more_fonts/UnpackedTarball_noto.mk
new file mode 100644
index 000000000000..ee6f223f8cad
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_noto.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_noto))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_noto,$(FONT_NOTO_TARBALL)))
+
+# vim: set noet sw=4 ts=4:

More information about the Libreoffice-commits mailing list