aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/cantarell-fonts/cantarell-fonts.SlackBuild33
-rw-r--r--system/cantarell-fonts/cantarell-fonts.info10
-rw-r--r--system/cantarell-fonts/slack-desc2
3 files changed, 20 insertions, 25 deletions
diff --git a/system/cantarell-fonts/cantarell-fonts.SlackBuild b/system/cantarell-fonts/cantarell-fonts.SlackBuild
index 44cec71a996b3..ce3224d1ce98f 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-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil
+# Copyright 2015-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=cantarell-fonts
-VERSION=${VERSION:-0.0.25}
+VERSION=${VERSION:-0.303.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -59,28 +59,23 @@ 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" \
-./autogen.sh \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/share/fonts/OTF
-mv $PKG/usr/share/fonts/cantarell $PKG/usr/share/fonts/OTF/
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+meson build -D useprebuilt=true
+meson compile -C build
+DESTDIR=$PKG meson install -C build
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/usr/share/metainfo
+cp -a $PKG/usr/local/share/metainfo/org.gnome.cantarell.metainfo.xml $PKG/usr/share/metainfo/org.gnome.cantarell.metainfo.xml
+mkdir -p $PKG/usr/share/fonts/TTF/cantarell
+cp -a $PKG/usr/local/share/fonts/cantarell/* $PKG/usr/share/fonts/TTF/cantarell/
+rm -rf $PKG/usr/local
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp 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 f1d2933fb2051..6843402e43e23 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://github.com/GNOME/cantarell-fonts"
-DOWNLOAD="https://github.com/GNOME/cantarell-fonts/archive/0.0.25/cantarell-fonts-0.0.25.tar.gz"
-MD5SUM="dc5b0e9395e187f67623c60ece19fd7b"
+VERSION="0.303.1"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/cantarell-fonts"
+DOWNLOAD="https://download.gnome.org/sources/cantarell-fonts/0.303/cantarell-fonts-0.303.1.tar.xz"
+MD5SUM="a9be59ddb29204dcfd3357f201949b8c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gnome-common"
+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 7b4b309cfd8b8..42bb41cd314a1 100644
--- a/system/cantarell-fonts/slack-desc
+++ b/system/cantarell-fonts/slack-desc
@@ -16,4 +16,4 @@ cantarell-fonts: Cantarell was originally designed by Dave Crossland as part of
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: Home page: https://github.com/GNOME/cantarell-fonts
+cantarell-fonts: Home page: https://gitlab.gnome.org/GNOME/cantarell-fonts