Date: Thursday, December 24, 2015 @ 18:55:09 Author: ronald Revision: 154455
upgpkg: ttf-inconsolata 20151221.480630d-1 update to latest version which improves hinting and adds bold version; Raph Levien moved the official upstream to google fonts -> update url to reflect the move; mirror the source so users don't have to checkout all google fonts from github when rebuilding Modified: ttf-inconsolata/trunk/PKGBUILD ttf-inconsolata/trunk/ttf-inconsolata.install Deleted: ttf-inconsolata/trunk/OFL.txt -------------------------+ OFL.txt | 97 ---------------------------------------------- PKGBUILD | 25 +++++------ ttf-inconsolata.install | 9 ---- 3 files changed, 14 insertions(+), 117 deletions(-) Deleted: OFL.txt =================================================================== --- OFL.txt 2015-12-24 15:45:21 UTC (rev 154454) +++ OFL.txt 2015-12-24 17:55:09 UTC (rev 154455) @@ -1,97 +0,0 @@ -Copyright (c) <dates>, <Copyright Holder> (<URL|email>), -with Reserved Font Name <Reserved Font Name>. -Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>), -with Reserved Font Name <additional Reserved Font Name>. -Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>). - -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 - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-24 15:45:21 UTC (rev 154454) +++ PKGBUILD 2015-12-24 17:55:09 UTC (rev 154455) @@ -1,24 +1,23 @@ # $Id$ -# Maintainer: pressh <pressh at gmail dot com> +# Maintainer: Ronald van Haren <[email protected]> pkgname=ttf-inconsolata -pkgver=20090215 -pkgrel=5 +pkgver=20151221.480630d +pkgrel=1 pkgdesc="Monospace font for pretty code listings and for the terminal" arch=('any') -url="http://levien.com/type/myfonts/inconsolata.html"; +url="https://www.google.com/fonts/specimen/Inconsolata"; license=('custom:OFL') depends=('fontconfig' 'xorg-font-utils') -source=('http://levien.com/type/myfonts/Inconsolata.otf' - '75-ttf-inconsolata.conf' - 'OFL.txt') +source=('https://sources.archlinux.org/other/community/ttf-inconsolata/ttf-inconsolata-480630d.tar.bz2' + '75-ttf-inconsolata.conf') install=${pkgname}.install -md5sums=('0fbe014c1f0fb5e3c71140ff0dc63edf' - '36fde7a83dc4f9d76f25242b761b46b8' - '6ed93967ff0dc6dd9c8d31c17f817a06') - +sha1sums=('628bacd3855a9328c2c84c3ad7d5caf9ebd2dc14' + '27cf0d59c91fd9ff2fb72de9d7ee5082a46a1792') + package() { - install -Dm644 ${srcdir}/Inconsolata.otf ${pkgdir}/usr/share/fonts/OTF/Inconsolata.otf + install -d ${pkgdir}/usr/share/fonts/TTF + install -Dm644 ${srcdir}/inconsolata/*.ttf ${pkgdir}/usr/share/fonts/TTF + install -Dm644 ${srcdir}/inconsolata/OFL.txt ${pkgdir}/usr/share/licenses/ttf-inconsolata/OFL.txt install -Dm644 ${srcdir}/75-ttf-inconsolata.conf ${pkgdir}/etc/fonts/conf.avail/75-ttf-inconsolata.conf - install -Dm644 ${srcdir}/OFL.txt ${pkgdir}/usr/share/licenses/ttf-inconsolata/OFL.txt } Modified: ttf-inconsolata.install =================================================================== --- ttf-inconsolata.install 2015-12-24 15:45:21 UTC (rev 154454) +++ ttf-inconsolata.install 2015-12-24 17:55:09 UTC (rev 154455) @@ -1,18 +1,13 @@ post_install() { echo -n "Updating font cache... " fc-cache -s > /dev/null - mkfontscale /usr/share/fonts/OTF - mkfontdir /usr/share/fonts/OTF + mkfontscale /usr/share/fonts/TTF + mkfontdir /usr/share/fonts/TTF echo "done." } post_upgrade() { post_install - - if [ "$(vercmp 20090215-4 "$2")" -eq 1 ]; then - mkfontscale /usr/share/fonts/TTF - mkfontdir /usr/share/fonts/TTF - fi } post_remove() {
