system/ttf-inconsolata: Updated for version 3.000.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 13 insertions, 105 deletions

diff --git a/system/ttf-inconsolata/OFL.txt b/system/ttf-inconsolata/OFL.txt
deleted file mode 100644
index 65f04cae46c0..000000000000
--- a/system/ttf-inconsolata/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2006 The Inconsolata Project Authors
-
-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.
diff --git a/system/ttf-inconsolata/ttf-inconsolata.SlackBuild b/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
index 1b9af687b5b5..29865606c13a 100644
--- a/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
+++ b/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for ttf-inconsolata.
 #
-# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ttf-inconsolata
-VERSION=${VERSION:-20160814}
+VERSION=${VERSION:-3.000}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -44,13 +44,16 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+SRCNAM="Inconsolata"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
+tar -xzvf $CWD/$SRCNAM-$VERSION.tar.?z
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -62,13 +65,13 @@ find -L . \
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-install -m 644 -D $CWD/75-ttf-inconsolata.conf $PKG/etc/fonts/conf.avail/75-ttf-inconsolata.conf
-
 install -d $PKG/usr/share/fonts/TTF/
-install -m 644 $CWD/Inconsolata-{Regular,Bold}.ttf $PKG/usr/share/fonts/TTF/
+install -Dm644 fonts/ttf/*.ttf "$PKG/usr/share/fonts/TTF"
+
+install -Dm644 $CWD/75-ttf-inconsolata.conf $PKG/usr/share/fontconfig/conf.avail/75-ttf-inconsolata.conf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dm644 AUTHORS.txt CONTRIBUTORS.txt FONTLOG.txt OFL.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/ttf-inconsolata/ttf-inconsolata.info b/system/ttf-inconsolata/ttf-inconsolata.info
index 2b5094ce6be5..9ac4d09f99f6 100644
--- a/system/ttf-inconsolata/ttf-inconsolata.info
+++ b/system/ttf-inconsolata/ttf-inconsolata.info
@@ -1,10 +1,8 @@
 PRGNAM="ttf-inconsolata"
-VERSION="20160814"
+VERSION="3.000"
 HOMEPAGE="https://fonts.google.com/specimen/Inconsolata"
-DOWNLOAD="https://github.com/google/fonts/raw/c6c7e432a29bd7c817feed0963f568a6d710625c/ofl/inconsolata/Inconsolata-Regular.ttf \
-          https://github.com/google/fonts/raw/c6c7e432a29bd7c817feed0963f568a6d710625c/ofl/inconsolata/Inconsolata-Bold.ttf"
-MD5SUM="b0639eb725c0df94f68b779889679457 \
-        c6623d74820bb62d25c969a50bafbb46"
+DOWNLOAD="https://github.com/googlefonts/Inconsolata/archive/v3.000/Inconsolata-3.000.tar.gz"
+MD5SUM="ee64a03c5fcd02702127d7ba324b7b23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""