[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac distro-configs/CPLinux.conf download.lst external/Module_external.mk external/noto_font Makefile.fetch scp2/source setup_native/source
Andras Timar
andras.timar at collabora.com
Sun Nov 6 20:06:30 UTC 2016
Makefile.fetch | 3
configure.ac | 20 ++
distro-configs/CPLinux.conf | 1
download.lst | 2
external/Module_external.mk | 1
external/noto_font/ExternalPackage_noto.mk | 230 +++++++++++++++++++++++
external/noto_font/Makefile | 7
external/noto_font/Module_noto_font.mk | 17 +
external/noto_font/README | 1
external/noto_font/UnpackedTarball_noto.mk | 14 +
scp2/source/ooo/file_font_ooo.scp | 5
scp2/source/ooo/module_hidden_ooo.scp | 13 +
setup_native/source/packinfo/package_names.txt | 1
setup_native/source/packinfo/packinfo_office.txt | 15 +
14 files changed, 330 insertions(+)
New commits:
commit 1b6ec3bddf80775fe939875c188c61cd4241441e
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun Nov 6 21:03:40 2016 +0100
Bundle Google Noto fonts
Change-Id: Ic39ef335a5829d7472090d253af7d6c74393c05a
diff --git a/Makefile.fetch b/Makefile.fetch
index 3c634f5..742aa06 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -235,6 +235,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
,$(call fetch_Download_item,http://ooo.itc.hu/oxygenoffice/download/libreoffice,$(item)))
$(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \
, $(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_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item)))
@mkdir -p $(dir $@) && touch $@
# vim: set noet sw=4 ts=4:
diff --git a/configure.ac b/configure.ac
index cdcd7cb..aaf06a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1572,6 +1572,11 @@ AC_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 Google Noto font.]),
+,)
+
AC_ARG_WITH(epm,
AS_HELP_STRING([--with-epm],
[Decides which epm to use. Default is to use the one from the system if
@@ -11559,6 +11564,21 @@ AC_SUBST(WITH_FONTS)
AC_DEFINE_UNQUOTED([TEST_FONTS_MISSING], $TEST_FONTS_MISSING)
dnl ===================================================================
+dnl Test whether to include Google Noto fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include 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 include extra galleries
dnl ===================================================================
AC_MSG_CHECKING([whether to include extra galleries])
diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index cc163fe..bd14184 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -15,6 +15,7 @@
--without-helppack-integration
--with-linker-hash-style=both
--with-fonts
+--enable-noto-font
--with-external-thes-dir=/usr/share/mythes
--with-external-hyph-dir=/usr/share/hyphen
--with-external-dict-dir=/usr/share/hunspell
diff --git a/download.lst b/download.lst
index bd68989..4e49ab2 100755
--- a/download.lst
+++ b/download.lst
@@ -45,6 +45,8 @@ export FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip
export FONT_LIBERATION_NARROW_TARBALL := 134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
+export FONT_NOTO_TARBALL := Noto-hinted.zip
+export FONT_NOTO_MD5SUM := 5489f1765afd34a2adfdc04d014762e7
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 := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 7c78c7d..438618a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
+ $(call gb_Helper_optional,NOTO_FONT,noto_font) \
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,OPENCOLLADA,opencollada) \
diff --git a/external/noto_font/ExternalPackage_noto.mk b/external/noto_font/ExternalPackage_noto.mk
new file mode 100644
index 0000000..229cf7e
--- /dev/null
+++ b/external/noto_font/ExternalPackage_noto.mk
@@ -0,0 +1,230 @@
+# -*- 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,\
+ NotoColorEmoji.ttf \
+ NotoEmoji-Regular.ttf \
+ NotoKufiArabic-Bold.ttf \
+ NotoKufiArabic-Regular.ttf \
+ NotoMono-Regular.ttf \
+ NotoNaskhArabic-Bold.ttf \
+ NotoNaskhArabic-Regular.ttf \
+ NotoNaskhArabicUI-Bold.ttf \
+ NotoNaskhArabicUI-Regular.ttf \
+ NotoNastaliqUrdu-Regular.ttf \
+ NotoSansArmenian-Bold.ttf \
+ NotoSansArmenian-Regular.ttf \
+ NotoSansAvestan-Regular.ttf \
+ NotoSansBalinese-Regular.ttf \
+ NotoSansBamum-Regular.ttf \
+ NotoSansBatak-Regular.ttf \
+ NotoSansBengali-Bold.ttf \
+ NotoSansBengali-Regular.ttf \
+ NotoSansBengaliUI-Bold.ttf \
+ NotoSansBengaliUI-Regular.ttf \
+ NotoSans-BoldItalic.ttf \
+ NotoSans-Bold.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 \
+ 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 \
+ NotoSansGeorgian-Bold.ttf \
+ NotoSansGeorgian-Regular.ttf \
+ NotoSansGlagolitic-Regular.ttf \
+ 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 \
+ NotoSansImperialAramaic-Regular.ttf \
+ NotoSansInscriptionalPahlavi-Regular.ttf \
+ NotoSansInscriptionalParthian-Regular.ttf \
+ NotoSans-Italic.ttf \
+ NotoSansJavanese-Regular.ttf \
+ 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 \
+ NotoSansLisu-Regular.ttf \
+ NotoSansLycian-Regular.ttf \
+ 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 \
+ NotoSansOlChiki-Regular.ttf \
+ NotoSansOldItalic-Regular.ttf \
+ NotoSansOldPersian-Regular.ttf \
+ NotoSansOldSouthArabian-Regular.ttf \
+ NotoSansOldTurkic-Regular.ttf \
+ NotoSansOriya-Bold.ttf \
+ NotoSansOriya-Regular.ttf \
+ NotoSansOriyaUI-Bold.ttf \
+ NotoSansOriyaUI-Regular.ttf \
+ NotoSansOsmanya-Regular.ttf \
+ NotoSansPhagsPa-Regular.ttf \
+ NotoSansPhoenician-Regular.ttf \
+ NotoSans-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 \
+ 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 \
+ NotoSerifArmenian-Regular.ttf \
+ NotoSerifBengali-Bold.ttf \
+ NotoSerifBengali-Regular.ttf \
+ NotoSerif-BoldItalic.ttf \
+ NotoSerif-Bold.ttf \
+ NotoSerifDevanagari-Bold.ttf \
+ NotoSerifDevanagari-Regular.ttf \
+ NotoSerifGeorgian-Bold.ttf \
+ NotoSerifGeorgian-Regular.ttf \
+ NotoSerifGujarati-Bold.ttf \
+ NotoSerifGujarati-Regular.ttf \
+ NotoSerif-Italic.ttf \
+ NotoSerifKannada-Bold.ttf \
+ NotoSerifKannada-Regular.ttf \
+ NotoSerifKhmer-Bold.ttf \
+ NotoSerifKhmer-Regular.ttf \
+ NotoSerifLao-Bold.ttf \
+ NotoSerifLao-Regular.ttf \
+ NotoSerifMalayalam-Bold.ttf \
+ NotoSerifMalayalam-Regular.ttf \
+ NotoSerif-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/Makefile b/external/noto_font/Makefile
new file mode 100644
index 0000000..e4968cf8
--- /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 0000000..a69039e
--- /dev/null
+++ b/external/noto_font/Module_noto_font.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_Module_Module,noto_font))
+
+$(eval $(call gb_Module_add_targets,noto_font,\
+ ExternalPackage_noto \
+ UnpackedTarball_noto \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/noto_font/README b/external/noto_font/README
new file mode 100644
index 0000000..96377c3
--- /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 0000000..440d4de
--- /dev/null
+++ b/external/noto_font/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),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 ae938bd..7589d47 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -67,6 +67,11 @@ STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
//Karla fonts
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")
+#endif
+
#endif
// fontconfig updates to allow proper use of local fonts
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 559d367..993f7cc 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -112,6 +112,19 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_SourceCode,
gid_File_FcLocal_Conf);
End
+#ifdef WITH_NOTO_FONT
+Module gid_Module_Root_Fonts_Noto_Hidden
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ InstallOrder = "100";
+ Name = "gid_Module_Root_Fonts_Noto_Hidden";
+ Description = "gid_Module_Root_Fonts_Noto_Hidden";
+ Sortkey = "2150";
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Fnt_Noto);
+End
+#endif
#endif
Module gid_Module_Oo_Linguistic
diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index f23e332..1021210 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -24,6 +24,7 @@
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress Impress module for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration KDE integration module for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math Math module for %PRODUCTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-noto-fonts Google Noto fonts for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate Online update modul for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts Mailcap module for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic Linguistic module for %PRODUCTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index e6564c3..e7d76cf 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -339,6 +339,21 @@ packageversion = "%PACKAGEVERSION"
End
Start
+module = "gid_Module_Root_Fonts_Noto_Hidden"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-noto-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-noto-fonts"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+copyright = "2016 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Google Noto fonts for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
module = "gid_Module_Oo_Linguistic"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
More information about the Libreoffice-commits
mailing list