summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Swagar2017-11-13 15:48:20 -0800
committerTyler Swagar2017-11-13 15:48:20 -0800
commit1c846b3a64df78447ce9f16768eaa8dfab7f5fab (patch)
treeaec403c40360d3b489dd4cf2c2eb55c7483faa45
parent3590ec93cd86afba9f6eea25128736ee9a05c189 (diff)
downloadaur-1c846b3a64df78447ce9f16768eaa8dfab7f5fab.tar.gz
Remove conflict with ttf-google-fonts-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f582493ec4a..1a5a1d61d66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Oct 31 20:43:26 UTC 2017
+# Mon Nov 13 23:38:50 UTC 2017
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 2.002
@@ -11,7 +11,6 @@ pkgbase = ttf-merriweather
depends = fontconfig
depends = xorg-fonts-encodings
depends = xorg-font-utils
- conflicts = ttf-google-fonts-git
conflicts = ttf-google-fonts-opinionated-git
conflicts = ttf-merriweather-ib
source = Merriweather-Black-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Black.ttf
diff --git a/PKGBUILD b/PKGBUILD
index 095a300b086..17eef56bb71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=('any')
url='http://sorkintype.com/'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
+conflicts=('ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
source=("Merriweather-Black-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Black.ttf"
"Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-BlackItalic.ttf"
"Merriweather-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Bold.ttf"