diff options
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = ttf-google-fonts-opinionated-git pkgdesc = TrueType fonts from Google Fonts, but with updated versions of some fonts pkgver = 20200602 - pkgrel = 1 + pkgrel = 2 url = https://github.com/google/fonts install = ttf-google-fonts-opinionated-git.install arch = any @@ -15,6 +15,7 @@ pkgbase = ttf-google-fonts-opinionated-git depends = ttf-droid depends = ttf-inconsolata depends = ttf-sil-padauk + depends = ttf-sil-abyssinica provides = adobe-source-code-pro-fonts provides = adobe-source-sans-pro-fonts provides = adobe-source-serif-pro-fonts @@ -60,7 +61,6 @@ pkgbase = ttf-google-fonts-opinionated-git provides = ttf-lato provides = ttf-sil-harmattan provides = ttf-sil-scheherazade - provides = ttf-sil-abyssinica provides = ttf-font conflicts = adobe-source-code-pro-fonts conflicts = adobe-source-sans-pro-fonts @@ -107,7 +107,6 @@ pkgbase = ttf-google-fonts-opinionated-git conflicts = ttf-lato conflicts = ttf-sil-harmattan conflicts = ttf-sil-scheherazade - conflicts = ttf-sil-abyssinica source = git+https://github.com/google/fonts.git md5sums = SKIP @@ -25,9 +25,11 @@ # ttf-sil-padauk: # Has more variants than Google Fonts. +# ttf-sil-abyssinica + pkgname=ttf-google-fonts-opinionated-git pkgver=20200602 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType fonts from Google Fonts, but with updated versions of some fonts" arch=('any') url="https://github.com/google/fonts" @@ -41,6 +43,7 @@ depends=('fontconfig' 'ttf-droid' 'ttf-inconsolata' 'ttf-sil-padauk' + 'ttf-sil-abyssinica' ) makedepends=('git') conflicts=('adobe-source-code-pro-fonts' @@ -89,7 +92,6 @@ conflicts=('adobe-source-code-pro-fonts' # ttf-sil-fonts packages 'ttf-sil-harmattan' 'ttf-sil-scheherazade' - 'ttf-sil-abyssinica' ) provides=("${conflicts[@]}" 'ttf-font') source=("git+https://github.com/google/fonts.git") @@ -115,6 +117,7 @@ package() { "$pkgdir/usr/share/fonts/TTF" \; # Remove excluded fonts. + find "${pkgdir}/usr/share/fonts/" -type f -name "AbyssinicaSIL-*.ttf" -delete find "${pkgdir}/usr/share/fonts/" -type f -name "Cantarell-*.ttf" -delete find "${pkgdir}/usr/share/fonts/" -type f -name "Droid*.ttf" -delete find "${pkgdir}/usr/share/fonts/" -type f -name "Inconsolata-*.ttf" -delete |