summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO38
-rw-r--r--PKGBUILD40
2 files changed, 39 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 517b6282cf50..a92884ec29c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
- pkgver = 2.002
- pkgrel = 2
+ pkgver = 2.003
+ pkgrel = 1
epoch = 1
url = http://sorkintype.com/
arch = any
@@ -11,23 +11,23 @@ pkgbase = ttf-merriweather
depends = xorg-font-utils
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
- source = Merriweather-BlackItalic-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-BlackItalic.ttf
- source = Merriweather-Bold-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Bold.ttf
- source = Merriweather-BoldItalic-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-BoldItalic.ttf
- source = Merriweather-Italic-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Italic.ttf
- source = Merriweather-Light-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Light.ttf
- source = Merriweather-LightItalic-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-LightItalic.ttf
- source = Merriweather-Regular-2.002.ttf::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/Merriweather-Regular.ttf
- source = ttf-merriweather-2.002-OFL.txt::https://github.com/google/fonts/raw/b848f42f0bc0a8bc53588c3688ca37890e1db0bd/ofl/merriweather/OFL.txt
- sha256sums = dff1048499a2c245713dfa41e3683cfecfd15df757cc4cb20f85bceba7bfd58b
- sha256sums = 42b5cdd80b293acb1d7a15958a2c2f8b6b95213709110777486763c75bc83ebf
- sha256sums = 55139769a87085bff777f68e3ecf92450c21a04c5ddd1e9e9528960ba4088c9f
- sha256sums = 403b1bece3d70420e65c670315693e9bca255e9c95884d9cb2b334838e67b509
- sha256sums = fc80dbac0ca9da894ae1801df9abe58f6dcca179ec4f8f6f7ea80fd13a1d387d
- sha256sums = d3ecc46bab128ed073ad9189bd7efdd2df455d8942ec056f14129bf35bcea7e5
- sha256sums = 8521c8eb542adf178b19c7ab7a0210fb4715fe68bb6ea578be129277b642c1f0
- sha256sums = bc38fe756b3e259248183fc0b75ad81b02774f3ca68e5e544e925827b0186d40
+ source = Merriweather-Black-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-Black.ttf
+ source = Merriweather-BlackItalic-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-BlackItalic.ttf
+ source = Merriweather-Bold-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-Bold.ttf
+ source = Merriweather-BoldItalic-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-BoldItalic.ttf
+ source = Merriweather-Italic-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-Italic.ttf
+ source = Merriweather-Light-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-Light.ttf
+ source = Merriweather-LightItalic-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-LightItalic.ttf
+ source = Merriweather-Regular-2.003.ttf::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/fonts/ttf/Merriweather-Regular.ttf
+ source = ttf-merriweather-2.003-OFL.txt::https://github.com/EbenSorkin/Merriweather/raw/a792c77e48a672b821c0a4f98900ed39b6b0b3e9/OFL.txt
+ sha256sums = c62d90972158ee114b7dc10cc4496f2795087551a0c3ecba0a3653a5ab387be6
+ sha256sums = d2dd7ddf29c1fa41a5d232ffa7c8fc76a0d5b31fd2c29c26f32e14fb1cbe743a
+ sha256sums = 60c5d1fb1ebc9b001a2768ef20ab6ee213386aea6e4a952479a57fd83d3d6eb3
+ sha256sums = 263492fbb7c1da5a9ff8a74796d34c0bfa91fa35f60ba186b46f8a56d8ba92c8
+ sha256sums = 4bf969bb2dddf44326a7dc152440d9130fcd5a5e2790c834268a2df46362a5b8
+ sha256sums = 8f1134ed77d1095bdaa804b1cf9adabe21a758060db3de0d29b5e32882eb374a
+ sha256sums = 94c743e850aafad18156e16885b63e03dd316e7ad33f61c1987c19991e6741d8
+ sha256sums = 6f3c50b5537925e499cbe79374d74290cb741f7ac2f15f3ddf25713473ff76cf
sha256sums = a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad
pkgname = ttf-merriweather
diff --git a/PKGBUILD b/PKGBUILD
index 6f4236930f18..668da1e09517 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Tyler Swagar <buttpickle69@shaw.ca>
pkgname=ttf-merriweather
-_commit='b848f42f0bc0a8bc53588c3688ca37890e1db0bd'
-pkgver=2.002
-pkgrel=2
+_commit='a792c77e48a672b821c0a4f98900ed39b6b0b3e9'
+pkgver=2.003
+pkgrel=1
epoch=1
pkgdesc='A typeface that is pleasant to read on screens by Sorkin Type Co'
arch=('any')
@@ -11,23 +11,23 @@ url='http://sorkintype.com/'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
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"
- "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-BoldItalic.ttf"
- "Merriweather-Italic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Italic.ttf"
- "Merriweather-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Light.ttf"
- "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-LightItalic.ttf"
- "Merriweather-Regular-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Regular.ttf"
- "${pkgname}-${pkgver}-OFL.txt::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/OFL.txt")
-sha256sums=('dff1048499a2c245713dfa41e3683cfecfd15df757cc4cb20f85bceba7bfd58b'
- '42b5cdd80b293acb1d7a15958a2c2f8b6b95213709110777486763c75bc83ebf'
- '55139769a87085bff777f68e3ecf92450c21a04c5ddd1e9e9528960ba4088c9f'
- '403b1bece3d70420e65c670315693e9bca255e9c95884d9cb2b334838e67b509'
- 'fc80dbac0ca9da894ae1801df9abe58f6dcca179ec4f8f6f7ea80fd13a1d387d'
- 'd3ecc46bab128ed073ad9189bd7efdd2df455d8942ec056f14129bf35bcea7e5'
- '8521c8eb542adf178b19c7ab7a0210fb4715fe68bb6ea578be129277b642c1f0'
- 'bc38fe756b3e259248183fc0b75ad81b02774f3ca68e5e544e925827b0186d40'
+source=("Merriweather-Black-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Black.ttf"
+ "Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-BlackItalic.ttf"
+ "Merriweather-Bold-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Bold.ttf"
+ "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-BoldItalic.ttf"
+ "Merriweather-Italic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Italic.ttf"
+ "Merriweather-Light-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Light.ttf"
+ "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-LightItalic.ttf"
+ "Merriweather-Regular-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Regular.ttf"
+ "${pkgname}-${pkgver}-OFL.txt::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/OFL.txt")
+sha256sums=('c62d90972158ee114b7dc10cc4496f2795087551a0c3ecba0a3653a5ab387be6'
+ 'd2dd7ddf29c1fa41a5d232ffa7c8fc76a0d5b31fd2c29c26f32e14fb1cbe743a'
+ '60c5d1fb1ebc9b001a2768ef20ab6ee213386aea6e4a952479a57fd83d3d6eb3'
+ '263492fbb7c1da5a9ff8a74796d34c0bfa91fa35f60ba186b46f8a56d8ba92c8'
+ '4bf969bb2dddf44326a7dc152440d9130fcd5a5e2790c834268a2df46362a5b8'
+ '8f1134ed77d1095bdaa804b1cf9adabe21a758060db3de0d29b5e32882eb374a'
+ '94c743e850aafad18156e16885b63e03dd316e7ad33f61c1987c19991e6741d8'
+ '6f3c50b5537925e499cbe79374d74290cb741f7ac2f15f3ddf25713473ff76cf'
'a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad')
package() {