Makefile.fetch | 4 ++++ Repository.mk | 4 ++++ download.lst | 8 ++++++++ external/more_fonts/ExternalPackage_amiri.mk | 20 ++++++++++++++++++++ external/more_fonts/ExternalPackage_kacst.mk | 17 +++++++++++++++++ external/more_fonts/ExternalPackage_reem.mk | 16 ++++++++++++++++ external/more_fonts/ExternalPackage_scheherazade.mk | 17 +++++++++++++++++ external/more_fonts/Module_more_fonts.mk | 8 ++++++++ external/more_fonts/UnpackedTarball_amiri.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_kacst.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_reem.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++++++++++++++ 12 files changed, 150 insertions(+)
New commits: commit 26c4a36cad9aca8e07abcbfeddf744ae112a4bc0 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 18:57:02 2017 +0400 tdf#113532 Add Arabic fonts into default installation Includes these fonts * Amiri * KACSTOffice, KACSTBook * Reem Kufi * Scheherazade Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9 Reviewed-on: https://gerrit.libreoffice.org/46624 Reviewed-by: Yousuf Philips <philip...@hotmail.com> Tested-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 4eaeb8058d75d03e782d37b430b68890aa374f2c) Reviewed-on: https://gerrit.libreoffice.org/46955 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Khaled Hosny <khaledho...@eglug.org> diff --git a/Makefile.fetch b/Makefile.fetch index 33558239eeb8..42a8ca8684f9 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_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 8f5347fac910..92f24a886b98 100644 --- a/Repository.mk +++ b/Repository.mk @@ -946,19 +946,23 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ fonts_alef \ + fonts_amiri \ fonts_caladea \ fonts_carlito \ fonts_culmus \ fonts_dejavu \ fonts_emojione_color \ fonts_gentium \ + fonts_kacst \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ fonts_libre_hebrew \ fonts_noto \ + fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index f96ddba2582d..4ff5737e3540 100644 --- a/download.lst +++ b/download.lst @@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz +export FONT_AMIRI_SHA256SUM := 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6 +export FONT_AMIRI_TARBALL := amiri-0.109.zip +export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 +export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz +export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b +export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz +export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 +export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk new file mode 100644 index 000000000000..ccf5f1c94c8a --- /dev/null +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -0,0 +1,20 @@ +# -*- 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_amiri,font_amiri)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + amiri-bold.ttf \ + amiri-boldslanted.ttf \ + amiri-quran.ttf \ + amiri-regular.ttf \ + amiri-slanted.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_kacst.mk b/external/more_fonts/ExternalPackage_kacst.mk new file mode 100644 index 000000000000..909ed11110b3 --- /dev/null +++ b/external/more_fonts/ExternalPackage_kacst.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_kacst,font_kacst)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_kacst,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + KacstBook.ttf \ + KacstOffice.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_reem.mk b/external/more_fonts/ExternalPackage_reem.mk new file mode 100644 index 000000000000..b90d4c0ed86e --- /dev/null +++ b/external/more_fonts/ExternalPackage_reem.mk @@ -0,0 +1,16 @@ +# -*- 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_reem,font_reem)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_reem,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + ReemKufi-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_scheherazade.mk b/external/more_fonts/ExternalPackage_scheherazade.mk new file mode 100644 index 000000000000..8bf269e8910e --- /dev/null +++ b/external/more_fonts/ExternalPackage_scheherazade.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_scheherazade,font_scheherazade)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_scheherazade,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Scheherazade-Bold.ttf \ + Scheherazade-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 d86d7b4c5e75..c6944cb6264e 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -11,11 +11,13 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_alef \ + ExternalPackage_amiri \ ExternalPackage_caladea \ ExternalPackage_carlito \ ExternalPackage_culmus \ ExternalPackage_dejavu \ ExternalPackage_gentium \ + ExternalPackage_kacst \ ExternalPackage_liberation \ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ @@ -23,13 +25,17 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ ExternalPackage_noto \ + ExternalPackage_reem \ + ExternalPackage_scheherazade \ ExternalPackage_EmojiOne_Color \ UnpackedTarball_alef \ + UnpackedTarball_amiri \ UnpackedTarball_caladea \ UnpackedTarball_carlito \ UnpackedTarball_culmus \ UnpackedTarball_dejavu \ UnpackedTarball_gentium \ + UnpackedTarball_kacst \ UnpackedTarball_liberation \ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ @@ -37,6 +43,8 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_sourcecode \ UnpackedTarball_sourcesans \ UnpackedTarball_noto \ + UnpackedTarball_reem \ + UnpackedTarball_scheherazade \ UnpackedTarball_EmojiOne_Color \ )) diff --git a/external/more_fonts/UnpackedTarball_amiri.mk b/external/more_fonts/UnpackedTarball_amiri.mk new file mode 100644 index 000000000000..75d0246b6507 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_amiri.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_amiri)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_amiri,$(FONT_AMIRI_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_kacst.mk b/external/more_fonts/UnpackedTarball_kacst.mk new file mode 100644 index 000000000000..7972da8d3e8f --- /dev/null +++ b/external/more_fonts/UnpackedTarball_kacst.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_kacst)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_kacst,$(FONT_KACST_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_reem.mk b/external/more_fonts/UnpackedTarball_reem.mk new file mode 100644 index 000000000000..77e3365396bf --- /dev/null +++ b/external/more_fonts/UnpackedTarball_reem.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_reem)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_reem,$(FONT_REEM_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_scheherazade.mk b/external/more_fonts/UnpackedTarball_scheherazade.mk new file mode 100644 index 000000000000..b5b6f368f402 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_scheherazade.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_scheherazade)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_scheherazade,$(FONT_SCHEHERAZADE_TARBALL))) + +# vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits