Kaydet (Commit) 21dc27ab authored tarafından Andras Timar's avatar Andras Timar

Bundle Karla font

Change-Id: I666665c801367ff760b14b9f474952e9894b4791
üst 297bbb8c
......@@ -170,6 +170,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_KARLA_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
......
......@@ -47,6 +47,7 @@ export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-2
export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
export FONT_DEJAVU_TARBALL := a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip
export FONT_GENTIUM_TARBALL := 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
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
......
# -*- 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_karla,font_karla))
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_karla,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
Karla-Italic.ttf \
Karla-Regular.ttf \
Karla-BoldItalic.ttf \
Karla-Bold.ttf \
))
# vim: set noet sw=4 ts=4:
......@@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_carlito \
ExternalPackage_dejavu \
ExternalPackage_gentium \
ExternalPackage_karla \
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
......@@ -26,6 +27,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_carlito \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
UnpackedTarball_karla \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
......
# -*- 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_karla))
$(eval $(call gb_UnpackedTarball_set_tarball,font_karla,$(FONT_KARLA_TARBALL)))
# vim: set noet sw=4 ts=4:
......@@ -1333,11 +1333,11 @@ libxml2
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of Daniel Veillard shall
not be used in advertising or otherwise to promote the sale, use or
......@@ -3077,6 +3077,22 @@ Gentium
See SIL Open Font License, Version 1.1 below
Karla
The following software may be included in this product: Karla fonts.
Use of any of this software is governed by the terms of the license
below:
Copyright (c) 2011, Jonathan Pinhorn
(pinhorn.typedesign@gmail.com), with Reserved Font Names “Karla”
and “Karla Tamil”.
This Font Software is licensed under the SIL Open Font License, Version
1.1. This license is copied below, and is also available with a
FAQ at: http://scripts.sil.org/OFL
See SIL Open Font License, Version 1.1 below
Liberation
The following software may be included in this product: Liberation
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -62,6 +62,9 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
//Karla fonts
STD_FONT_FILELIST(gid_File_Fnt_Karla, "fonts_karla.filelist")
#endif
// fontconfig updates to allow proper use of local fonts
......
......@@ -102,6 +102,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_Karla,
gid_File_Fnt_LibSansNarrow,
gid_File_Fnt_Liberation,
gid_File_Fnt_LinuxLibertineG,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment