diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 45 |
2 files changed, 44 insertions, 25 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 = 20150721 - pkgrel = 1 + pkgver = 20200602 + pkgrel = 2 url = https://github.com/google/fonts install = ttf-google-fonts-opinionated-git.install arch = any @@ -13,9 +13,9 @@ pkgbase = ttf-google-fonts-opinionated-git depends = xorg-mkfontscale depends = cantarell-fonts depends = ttf-droid - depends = ttf-fira-sans - depends = ttf-fira-mono 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 @@ -26,12 +26,13 @@ pkgbase = ttf-google-fonts-opinionated-git provides = openarch_fonts provides = otf-bitter provides = otf-goudy - provides = ttf-andika provides = ttf-anonymous-pro provides = ttf-cardo provides = ttf-chromeos-fonts provides = ttf-comfortaa provides = ttf-croscore + provides = ttf-fira-mono + provides = ttf-fira-sans provides = ttf-google-fonts-git provides = ttf-google-fonts-hg provides = ttf-google-webfonts @@ -52,16 +53,18 @@ pkgbase = ttf-google-fonts-opinionated-git provides = ttf-pt-sans provides = ttf-roboto provides = ttf-roboto-mono - provides = ttf-sil-fonts provides = ttf-sortsmillgoudy provides = ttf-source-code-pro provides = ttf-source-sans-pro provides = ttf-ubuntu-font-family provides = ttf-vollkorn provides = ttf-lato + provides = ttf-sil-harmattan + provides = ttf-sil-scheherazade provides = ttf-font conflicts = adobe-source-code-pro-fonts conflicts = adobe-source-sans-pro-fonts + conflicts = adobe-source-serif-pro-fonts conflicts = googlefontdirectory conflicts = jsmath-fonts conflicts = lohit-fonts @@ -69,11 +72,13 @@ pkgbase = ttf-google-fonts-opinionated-git conflicts = openarch_fonts conflicts = otf-bitter conflicts = otf-goudy - conflicts = ttf-andika conflicts = ttf-anonymous-pro conflicts = ttf-cardo conflicts = ttf-chromeos-fonts conflicts = ttf-comfortaa + conflicts = ttf-croscore + conflicts = ttf-fira-mono + conflicts = ttf-fira-sans conflicts = ttf-google-fonts-git conflicts = ttf-google-fonts-hg conflicts = ttf-google-webfonts @@ -94,14 +99,15 @@ pkgbase = ttf-google-fonts-opinionated-git conflicts = ttf-pt-sans conflicts = ttf-roboto conflicts = ttf-roboto-mono - conflicts = ttf-sil-fonts conflicts = ttf-sortsmillgoudy conflicts = ttf-source-code-pro conflicts = ttf-source-sans-pro conflicts = ttf-ubuntu-font-family conflicts = ttf-vollkorn conflicts = ttf-lato - source = git://github.com/google/fonts.git + conflicts = ttf-sil-harmattan + conflicts = ttf-sil-scheherazade + source = git+https://github.com/google/fonts.git md5sums = SKIP pkgname = ttf-google-fonts-opinionated-git @@ -1,4 +1,5 @@ # Maintainer: Kai Ninomiya <kainino1@gmail.com> +# Maintainer: Caleb Maclennan <caleb@alerque.com> # Submitter: Veeti Paananen <veeti.paananen@rojekti.fi> # Contributor: Sebastian Stammler <stammler.s@gmail.com> # Contributor: Sarkasper <echo a2FzcGVyLm1lbnRlbkBnbXguY29tCg== | base64 -d> @@ -11,19 +12,24 @@ # otherwise unsuitable (bugs, etc.) Their individual packages are included as # dependencies instead. A list of excluded fonts is below. -# Cantarell: Google ships an outdated version compared to the cantarell-fonts -# package. +# cantarell-fonts: +# Google ships an outdated version compared to the cantarell-fonts package. +# https://github.com/google/fonts/issues/112 -# Droid: the ttf-droid package includes more variants. +# ttf-droid: +# The ttf-droid package includes more variants. -# Fira Sans & Fira Mono: Google ships an outdated and buggy version. -# https://github.com/google/fonts/issues/10 +# ttf-inconsolata: +# Google ships a modified version. -# Inconsolata: Google ships a modified version. +# ttf-sil-padauk: +# Has more variants than Google Fonts. + +# ttf-sil-abyssinica pkgname=ttf-google-fonts-opinionated-git -pkgver=20160311 -pkgrel=1 +pkgver=20200602 +pkgrel=2 pkgdesc="TrueType fonts from Google Fonts, but with updated versions of some fonts" arch=('any') url="https://github.com/google/fonts" @@ -32,12 +38,13 @@ depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontdir' 'xorg-mkfontscale' - + # Fonts excluded from this package: 'cantarell-fonts' 'ttf-droid' - 'ttf-fira-sans' - 'ttf-fira-mono' - 'ttf-inconsolata') + 'ttf-inconsolata' + 'ttf-sil-padauk' + 'ttf-sil-abyssinica' + ) makedepends=('git') conflicts=('adobe-source-code-pro-fonts' 'adobe-source-sans-pro-fonts' @@ -49,12 +56,13 @@ conflicts=('adobe-source-code-pro-fonts' 'openarch_fonts' 'otf-bitter' 'otf-goudy' - 'ttf-andika' 'ttf-anonymous-pro' 'ttf-cardo' 'ttf-chromeos-fonts' 'ttf-comfortaa' 'ttf-croscore' + 'ttf-fira-mono' + 'ttf-fira-sans' 'ttf-google-fonts-git' 'ttf-google-fonts-hg' 'ttf-google-webfonts' @@ -75,13 +83,16 @@ conflicts=('adobe-source-code-pro-fonts' 'ttf-pt-sans' 'ttf-roboto' 'ttf-roboto-mono' - 'ttf-sil-fonts' 'ttf-sortsmillgoudy' 'ttf-source-code-pro' 'ttf-source-sans-pro' 'ttf-ubuntu-font-family' 'ttf-vollkorn' - 'ttf-lato') + 'ttf-lato' + # ttf-sil-fonts packages + 'ttf-sil-harmattan' + 'ttf-sil-scheherazade' + ) provides=("${conflicts[@]}" 'ttf-font') source=("git+https://github.com/google/fonts.git") md5sums=('SKIP') @@ -106,8 +117,10 @@ 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 "Fira*.ttf" -delete find "${pkgdir}/usr/share/fonts/" -type f -name "Inconsolata-*.ttf" -delete + find "${pkgdir}/usr/share/fonts/" -type f -name "Ligconsolata-*.ttf" -delete + find "${pkgdir}/usr/share/fonts/" -type f -name "Padauk-*.ttf" -delete } |