summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancoism902021-01-18 11:15:59 +0100
committerfrancoism902021-01-18 11:15:59 +0100
commitd407546ca0779c9d72318c048ad5edb00583283c (patch)
tree9f95abc782343578008504994fa25fbf8b247695
parent661cdcc775f72763c519e6c27f974de8ed11eb3e (diff)
downloadaur-d407546ca0779c9d72318c048ad5edb00583283c.tar.gz
Add more conflicts
-rwxr-xr-x.SRCINFO5
-rwxr-xr-xPKGBUILD10
2 files changed, 12 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 906c1d2aa4c5..c1c2b7cd77c0 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nerd-fonts-complete
pkgdesc = Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts.
pkgver = 2.1.0
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/ryanoasis/nerd-fonts
arch = any
license = MIT
@@ -10,6 +10,9 @@ pkgbase = nerd-fonts-complete
makedepends = xorg-font-util
conflicts = nerd-fonts-git
conflicts = nerd-fonts-complete-mono-glyphs
+ conflicts = nerd-fonts-hack
+ conflicts = ttf-nerd-fonts-symbols
+ conflicts = ttf-nerd-fonts-symbols-mono
source = fix-installer-font-dir.patch
source = nerd-fonts-2.1.0.tar.gz::https://github.com/ryanoasis/nerd-fonts/archive/v2.1.0.tar.gz
sha256sums = ccf93b108044a87bfb29c3f836d2ce4d5bdb1829702e532a69ccb4ab4aecaceb
diff --git a/PKGBUILD b/PKGBUILD
index d07e6c90d34c..73e5f0e6bc7b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,19 @@
_gitname='nerd-fonts'
pkgname='nerd-fonts-complete'
pkgver=2.1.0
-pkgrel=4
+pkgrel=5
pkgdesc='Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts.'
arch=('any')
url='https://github.com/ryanoasis/nerd-fonts'
license=('MIT')
makedepends=('xorg-mkfontscale' 'xorg-bdftopcf' 'xorg-font-util')
-conflicts=('nerd-fonts-git' 'nerd-fonts-complete-mono-glyphs')
+conflicts=(
+ 'nerd-fonts-git'
+ 'nerd-fonts-complete-mono-glyphs'
+ 'nerd-fonts-hack'
+ 'ttf-nerd-fonts-symbols'
+ 'ttf-nerd-fonts-symbols-mono'
+)
source=(
'fix-installer-font-dir.patch'
"${_gitname}-${pkgver}.tar.gz::https://github.com/ryanoasis/nerd-fonts/archive/v${pkgver}.tar.gz"