summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD18
2 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 158e2c8c0531..bb6d82001f8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,20 @@
pkgbase = cascadia-code-git
pkgdesc = A new monospaced font that includes programming ligatures
- pkgver = 1911.21.r9.g0610f2d
+ pkgver = 1911.21.r13.gebfefd1
pkgrel = 1
url = https://github.com/microsoft/cascadia-code
arch = any
license = custom:OFL
makedepends = git
makedepends = python
- provides = otf-cascadia-code=1911.21.r9.g0610f2d
+ provides = otf-cascadia-code=1911.21.r13.gebfefd1
+ provides = ttf-cascadia-code=1911.21.r13.gebfefd1
+ conflicts = nerd-fonts-cascadia-code
+ conflicts = ttf-cascadia-code
source = git+https://github.com/microsoft/cascadia-code.git
sha256sums = SKIP
pkgname = otf-cascadia-code-git
+pkgname = ttf-cascadia-code-git
+
diff --git a/PKGBUILD b/PKGBUILD
index 20169f3fe4bf..b424400111f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
_gitname=cascadia-code
pkgbase=cascadia-code-git
-pkgname=("otf-${pkgbase}") # "ttf-${pkgbase}"
-pkgver=1911.21.r9.g0610f2d
+pkgname=("otf-${pkgbase}" "ttf-${pkgbase}")
+pkgver=1911.21.r13.gebfefd1
pkgrel=1
pkgdesc="A new monospaced font that includes programming ligatures"
url="https://github.com/microsoft/${_gitname}"
arch=('any')
license=('custom:OFL')
makedepends=('git' 'python')
-provides=("otf-cascadia-code=${pkgver}")
-#conflicts=('nerd-fonts-cascadia-code' 'ttf-cascadia-code' 'ttf-cascadia-code-git')
+provides=("otf-cascadia-code=${pkgver}" "ttf-cascadia-code=${pkgver}")
+conflicts=('nerd-fonts-cascadia-code' 'ttf-cascadia-code')
source=("git+${url}.git")
sha256sums=('SKIP')
@@ -35,8 +35,8 @@ package_otf-cascadia-code-git() {
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
-# package_ttf-cascadia-code-git() {
- # cd "${_gitname}"
- # install -Dm644 build/*.ttf -t "$pkgdir"/usr/share/fonts/TTF
- # install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-# }
+package_ttf-cascadia-code-git() {
+ cd "${_gitname}"
+ install -Dm644 build/*.ttf -t "$pkgdir"/usr/share/fonts/TTF
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}