From bde5e683286096b9255254b28a862e519d57f547 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 23 Oct 2013 14:57:32 +0100 Subject: bundle Carlito and Caladea Change-Id: Ibb68ad33764bcbab88e68c35805a00287177a5c8 --- download.lst | 2 ++ external/more_fonts/ExternalPackage_caladea.mk | 21 +++++++++++++++++++++ external/more_fonts/ExternalPackage_carlito.mk | 21 +++++++++++++++++++++ external/more_fonts/Module_more_fonts.mk | 4 ++++ external/more_fonts/UnpackedTarball_caladea.mk | 14 ++++++++++++++ external/more_fonts/UnpackedTarball_carlito.mk | 14 ++++++++++++++ 6 files changed, 76 insertions(+) create mode 100644 external/more_fonts/ExternalPackage_caladea.mk create mode 100644 external/more_fonts/ExternalPackage_carlito.mk create mode 100644 external/more_fonts/UnpackedTarball_caladea.mk create mode 100644 external/more_fonts/UnpackedTarball_carlito.mk diff --git a/download.lst b/download.lst index 56c8d0fa8161..c052c650ffd7 100644 --- a/download.lst +++ b/download.lst @@ -32,6 +32,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz +export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz +export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz export FONT_DEJAVU_TARBALL := f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip export FONT_GENTIUM_TARBALL := 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip export FONT_LIBERATION_NARROW_TARBALL := b3174b11c2b6a341f5c99b31088bd67b-liberation-fonts-ttf-1.07.3.tar.gz diff --git a/external/more_fonts/ExternalPackage_caladea.mk b/external/more_fonts/ExternalPackage_caladea.mk new file mode 100644 index 000000000000..d26cb476d395 --- /dev/null +++ b/external/more_fonts/ExternalPackage_caladea.mk @@ -0,0 +1,21 @@ +# -*- 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_caladea,font_caladea)) + +$(eval $(call gb_ExternalPackage_set_outdir,fonts_caladea,$(INSTROOT))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_caladea,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Caladea-Italic.ttf \ + Caladea-Regular.ttf \ + Caladea-BoldItalic.ttf \ + Caladea-Bold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_carlito.mk b/external/more_fonts/ExternalPackage_carlito.mk new file mode 100644 index 000000000000..d110161eb01a --- /dev/null +++ b/external/more_fonts/ExternalPackage_carlito.mk @@ -0,0 +1,21 @@ +# -*- 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_carlito,font_carlito)) + +$(eval $(call gb_ExternalPackage_set_outdir,fonts_carlito,$(INSTROOT))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_carlito,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Carlito-BoldItalic.ttf \ + Carlito-Regular.ttf \ + Carlito-Italic.ttf \ + Carlito-Bold.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 c9a751485802..3f4a653949dc 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,more_fonts)) $(eval $(call gb_Module_add_targets,more_fonts,\ Package_conf \ + ExternalPackage_caladea \ + ExternalPackage_carlito \ ExternalPackage_dejavu \ ExternalPackage_gentium \ ExternalPackage_liberation \ @@ -20,6 +22,8 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_ptserif \ ExternalPackage_sourcecode \ ExternalPackage_sourcesans \ + UnpackedTarball_caladea \ + UnpackedTarball_carlito \ UnpackedTarball_dejavu \ UnpackedTarball_gentium \ UnpackedTarball_liberation \ diff --git a/external/more_fonts/UnpackedTarball_caladea.mk b/external/more_fonts/UnpackedTarball_caladea.mk new file mode 100644 index 000000000000..7f5d65c12056 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_caladea.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_caladea)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_caladea,$(FONT_CALADEA_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_carlito.mk b/external/more_fonts/UnpackedTarball_carlito.mk new file mode 100644 index 000000000000..d14f29169128 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_carlito.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_carlito)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_carlito,$(FONT_CARLITO_TARBALL))) + +# vim: set noet sw=4 ts=4: -- cgit