summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Crerar2017-11-13 21:08:48 -0500
committerAndrew Crerar2017-11-13 21:08:48 -0500
commitb7e31b27889ade9d816bc9aa39067ea4b1597bc6 (patch)
tree813bf9578c5124e0997dbf15f0f81ddfb0b2759c
parentfb4d62d789ddacc2f1e3334ac3b55e965c33f455 (diff)
downloadaur-b7e31b27889ade9d816bc9aa39067ea4b1597bc6.tar.gz
Updating dependencies as well as fonts that this package does not provide anymore
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD26
2 files changed, 22 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53aae8e1b7bd..5a58709fa4b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,6 +21,12 @@ pkgbase = ttf-google-fonts-git
depends = ttf-roboto
depends = ttf-inconsolata
depends = cantarell-fonts
+ depends = ttf-merriweather
+ depends = ttf-merriweather-sans
+ depends = ttf-opensans
+ depends = ttf-oswald
+ depends = ttf-quintessential
+ depends = ttf-signika
provides = adobe-source-code-pro-fonts
provides = adobe-source-sans-pro-fonts
provides = jsmath-fonts
@@ -33,17 +39,11 @@ pkgbase = ttf-google-fonts-git
provides = ttf-lora-cyrillic
provides = ttf-lekton
provides = ttf-medievalsharp
- provides = ttf-merriweather
- provides = ttf-merriweather-sans
provides = ttf-nova
- provides = ttf-opensans
- provides = ttf-oswald
provides = ttf-oxygen
provides = ttf-oxygen-git
provides = ttf-pt-fonts
- provides = ttf-quintessential
provides = ttf-roboto-mono
- provides = ttf-signika
provides = ttf-sil-fonts
provides = ttf-source-code-pro-ibx
provides = ttf-source-sans-pro-ibx
@@ -60,17 +60,11 @@ pkgbase = ttf-google-fonts-git
conflicts = ttf-lora-cyrillic
conflicts = ttf-lekton
conflicts = ttf-medievalsharp
- conflicts = ttf-merriweather
- conflicts = ttf-merriweather-sans
conflicts = ttf-nova
- conflicts = ttf-opensans
- conflicts = ttf-oswald
conflicts = ttf-oxygen
conflicts = ttf-oxygen-git
conflicts = ttf-pt-fonts
- conflicts = ttf-quintessential
conflicts = ttf-roboto-mono
- conflicts = ttf-signika
conflicts = ttf-sil-fonts
conflicts = ttf-source-code-pro-ibx
conflicts = ttf-source-sans-pro-ibx
diff --git a/PKGBUILD b/PKGBUILD
index cb833c5bc2e1..f51f5608f08b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,22 +29,27 @@ depends=(fontconfig
ttf-croscore
ttf-roboto
ttf-inconsolata
- cantarell-fonts)
+ cantarell-fonts
+ ttf-merriweather
+ ttf-merriweather-sans
+ ttf-opensans
+ ttf-oswald
+ ttf-quintessential
+ ttf-signika)
makedepends=(git)
conflicts=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
lohit-fonts ttf-andika ttf-anonymous-pro ttf-cardo ttf-comfortaa
ttf-lato
- ttf-lora-cyrillic ttf-lekton ttf-medievalsharp ttf-merriweather
- ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
- ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto-mono
- ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx ttf-vollkorn-ibx ttf-arabeyes-fonts)
+ ttf-lora-cyrillic ttf-lekton ttf-medievalsharp
+ ttf-nova ttf-oxygen
+ ttf-oxygen-git ttf-pt-fonts ttf-roboto-mono
+ ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx ttf-vollkorn-ibx ttf-arabeyes-fonts)
provides=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
lohit-fonts ttf-andika ttf-anonymous-pro ttf-cardo ttf-comfortaa
ttf-lato
- ttf-lora-cyrillic ttf-lekton ttf-medievalsharp ttf-merriweather
- ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
- ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto-mono
- ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx ttf-vollkorn-ibx)
+ ttf-lora-cyrillic ttf-lekton ttf-medievalsharp ttf-nova ttf-oxygen
+ ttf-oxygen-git ttf-pt-fonts ttf-roboto-mono
+ ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx ttf-vollkorn-ibx)
source=(git+"${url}".git)
sha512sums=('SKIP')
@@ -60,7 +65,8 @@ package() {
[noto-sans]=1 [fira-sans]=1 [fira-mono]=1
[ubuntu]=1 [ubuntu-mono]=1 [tinos]=1 [arimo]=1
[cousine]=1 [roboto]=1 [roboto-condensed]=1
- [inconsolata]=1)
+ [inconsolata]=1 [merriweather]=1 [merriweather-sans]=1
+ [open-sans]=1 [oswald]=1 [quintessential]=1)
while IFS= read -rd '' file; do
font_family=$(fc-query -f '%{family[0]|downcase|translate( ,-)}\n' "$file" | sed -n '2p')