5 files changed, 20 insertions, 35 deletions
diff --git a/system/ttf-carlito/30-0-carlito.conf b/system/ttf-carlito/30-0-carlito.conf
deleted file mode 100644
index 70aa81b07ef3e..0000000000000
--- a/system/ttf-carlito/30-0-carlito.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-	 <!-- Carlito / Calibri -->
-	<alias binding="same">
-          <family>Carlito</family>
-            <accept>
-              <family>Calibri</family>
-            </accept>
-        </alias>
-        <alias binding="same">
-          <family>Calibri</family>
-            <default>
-               <family>Carlito</family>
-            </default>
-        </alias>
-</fontconfig>
diff --git a/system/ttf-carlito/README b/system/ttf-carlito/README
index 247ea7a84586e..f08552b363687 100644
--- a/system/ttf-carlito/README
+++ b/system/ttf-carlito/README
@@ -1,3 +1,7 @@
 ttf-carlito (Googles Carlito font)
 
-Googles Carlito font.
+Carlito is a font designed by Łukasz Dziedzic (@typoland) derived
+ttf-carlito: from Lato (also designed by Łukasz Dziedzic) that is
+metric-compatible with Calibri.
+
+It comes with Latin and Cyrillic character sets.
diff --git a/system/ttf-carlito/slack-desc b/system/ttf-carlito/slack-desc
index 666946312bd2e..f645c3a64beef 100644
--- a/system/ttf-carlito/slack-desc
+++ b/system/ttf-carlito/slack-desc
@@ -8,12 +8,12 @@
            |-----handy-ruler------------------------------------------------------|
 ttf-carlito: ttf-carlito (Googles Carlito font)
 ttf-carlito:
-ttf-carlito: Googles Carlito font.
-ttf-carlito:
-ttf-carlito: Home page:
-ttf-carlito: https://bugs.chromium.org/p/chromium/issues/detail?id=280557
-ttf-carlito:
+ttf-carlito: Carlito is a font designed by Łukasz Dziedzic (@typoland) derived
+ttf-carlito: from Lato (also designed by Łukasz Dziedzic) that is metric-compatible
+ttf-carlito: with Calibri.
+ttf-carlito: It comes with Latin and Cyrillic character sets.
 ttf-carlito:
+ttf-carlito: Home page: https://salsa.debian.org/fonts-team/fonts-crosextra-carlito
 ttf-carlito:
 ttf-carlito:
 ttf-carlito:
diff --git a/system/ttf-carlito/ttf-carlito.SlackBuild b/system/ttf-carlito/ttf-carlito.SlackBuild
index e78d243ce0c30..b3f3500f0a01f 100644
--- a/system/ttf-carlito/ttf-carlito.SlackBuild
+++ b/system/ttf-carlito/ttf-carlito.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for ttf-carlito.
 #
-# Copyright 2016 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-carlito
-VERSION=${VERSION:-20130920}
+VERSION=${VERSION:-20220224}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -44,7 +44,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM="crosextrafonts-carlito"
+SRCNAM="fonts-crosextra-carlito"
 
 set -e
 
@@ -52,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.gz
 mv $SRCNAM-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -66,12 +66,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 install -d $PKG/usr/share/fonts/TTF/
-install -m644 *.ttf $PKG/usr/share/fonts/TTF/
-
-install -Dm0644 $CWD/30-0-carlito.conf $PKG/etc/fonts/conf.avail/30-carlito.conf
+install -m644 fonts/ttf/* $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a OFL.txt $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-carlito/ttf-carlito.info b/system/ttf-carlito/ttf-carlito.info
index 724f63fb5024b..91ee48b0649db 100644
--- a/system/ttf-carlito/ttf-carlito.info
+++ b/system/ttf-carlito/ttf-carlito.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-carlito"
-VERSION="20130920"
-HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=280557"
-DOWNLOAD="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz"
-MD5SUM="c74b7223abe75949b4af367942d96c7a"
+VERSION="20220224"
+HOMEPAGE="https://salsa.debian.org/fonts-team/fonts-crosextra-carlito"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-crosextra-carlito/fonts-crosextra-carlito_20220224.orig.tar.gz"
+MD5SUM="eabdad6c5da5b22a1458a9d5836674e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""