From 2dec096b54fb739a4872577d820c055d90084a3e Mon Sep 17 00:00:00 2001
From: Edinaldo P. Silva
Date: Mon, 12 Feb 2018 21:49:56 +0000
Subject: system/cantarell-fonts: Updated for version 0.100.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/cantarell-fonts/cantarell-fonts.SlackBuild | 30 +++++++----------------
 system/cantarell-fonts/cantarell-fonts.info       | 10 ++++----
 system/cantarell-fonts/slack-desc                 |  8 +++---
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/system/cantarell-fonts/cantarell-fonts.SlackBuild b/system/cantarell-fonts/cantarell-fonts.SlackBuild
index 4db4adb1e9..32a263d655 100644
--- a/system/cantarell-fonts/cantarell-fonts.SlackBuild
+++ b/system/cantarell-fonts/cantarell-fonts.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for cantarell-fonts.
 #
-# Copyright 2015-2016 Edinaldo P. Silva, Rio de Janeiro, Brazil
+# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cantarell-fonts
-VERSION=${VERSION:-0.0.25}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.100}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -49,29 +49,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-configdir=/etc/fonts/conf.avail \
-  --build=$ARCH-slackware-linux
+meson --prefix $PKG/usr build
+ninja -C build all install
 
-make
-make install DESTDIR=$PKG
+mkdir -p $PKG/usr/share/fonts/OTF
+mv $PKG/usr/share/fonts/cantarell $PKG/usr/share/fonts/OTF/
 
 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
 
-mkdir -p $PKG/etc/fonts/conf.d
-ln -srt $PKG/etc/fonts/conf.d $PKG/etc/fonts/conf.avail/*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING NEWS 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/cantarell-fonts/cantarell-fonts.info b/system/cantarell-fonts/cantarell-fonts.info
index 51bf8fa68d..118d3c3436 100644
--- a/system/cantarell-fonts/cantarell-fonts.info
+++ b/system/cantarell-fonts/cantarell-fonts.info
@@ -1,10 +1,10 @@
 PRGNAM="cantarell-fonts"
-VERSION="0.0.25"
-HOMEPAGE="https://download.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.tar.xz"
-MD5SUM="8fa68460bb292b9c9441af10f99d99d7"
+VERSION="0.100"
+HOMEPAGE="https://github.com/GNOME/cantarell-fonts"
+DOWNLOAD="https://github.com/GNOME/cantarell-fonts/archive/0.100/cantarell-fonts-0.100.tar.gz"
+MD5SUM="04fd69a069e454a5f4097da1ffa44732"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="appstream-glib"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/cantarell-fonts/slack-desc b/system/cantarell-fonts/slack-desc
index cbb864bbe7..7b4b309cfd 100644
--- a/system/cantarell-fonts/slack-desc
+++ b/system/cantarell-fonts/slack-desc
@@ -8,12 +8,12 @@
                |-----handy-ruler------------------------------------------------------|
 cantarell-fonts: cantarell-fonts (The Cantarell typeface family)
 cantarell-fonts:
-cantarell-fonts: The Cantarell typeface family  is a contemporary
-cantarell-fonts: Humanist sans serif, and is used by the GNOME project for its user
-cantarell-fonts: interface and the Fedora project.)
+cantarell-fonts: The Cantarell typeface family  is a contemporary Humanist sans serif,
+cantarell-fonts: and is used by the GNOME project for its user interface and the
+cantarell-fonts: Fedora project.)
 cantarell-fonts:
 cantarell-fonts: Cantarell was originally designed by Dave Crossland as part of his
 cantarell-fonts: coursework for the MA Typeface Design programme at the Department
 cantarell-fonts: of Typography in the University of Reading, England.
 cantarell-fonts:
-cantarell-fonts: This is the open font officially chosen by default for the GNOME 3.
+cantarell-fonts: Home page: https://github.com/GNOME/cantarell-fonts
-- 
cgit v1.2.3