summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO36
-rw-r--r--PKGBUILD38
2 files changed, 37 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a92884ec29c5..93555e657208 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
- pkgver = 2.003
+ pkgver = 2.005
pkgrel = 1
epoch = 1
url = http://sorkintype.com/
@@ -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.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
+ source = Merriweather-Black-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-Black.ttf
+ source = Merriweather-BlackItalic-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-BlackItalic.ttf
+ source = Merriweather-Bold-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-Bold.ttf
+ source = Merriweather-BoldItalic-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-BoldItalic.ttf
+ source = Merriweather-Italic-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-Italic.ttf
+ source = Merriweather-Light-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-Light.ttf
+ source = Merriweather-LightItalic-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-LightItalic.ttf
+ source = Merriweather-Regular-2.005.ttf::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/fonts/ttfs/Merriweather-Regular.ttf
+ source = ttf-merriweather-2.005-OFL.txt::https://github.com/SorkinType/Merriweather/raw/ae0bf55e53517ac98cc74c375a383ad4c36f937a/OFL.txt
+ sha256sums = 73e4deb0e7c241a7e98ddcb9216c322be2a7f50df9b542f4aa3233154c12a852
+ sha256sums = 1f83c77a970d9832143f481b32ea705f97f238a0e7bb2c6ecd30a1de1b902f54
+ sha256sums = a03a68750a3ef5c50833ba8313e7ee4a1907c811da1a6e96a2f64718850706f4
+ sha256sums = 96c3e940049b0f7fb500620998d5aa0ad0a901c6a67c359859dd90b88d20e373
+ sha256sums = e9e7c00e9606290a2fc4e478f76256fe5e7b39f4e5c79bb3264595ffb18402bc
+ sha256sums = 5acd66e1d1841fc30649e195480a9552fa7e55d62c73b8b4795513761f911fb6
+ sha256sums = ba900a4ad03e5ee0fe0d91c083a0711bb1f434074950535a24583ad9e0bbf83d
+ sha256sums = 22ce375fea4f4c394dafb0637b7c18fc1783c64524da6806159c771efbe9a47a
sha256sums = a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad
pkgname = ttf-merriweather
diff --git a/PKGBUILD b/PKGBUILD
index 668da1e09517..a1ab4beeb84a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Tyler Swagar <buttpickle69@shaw.ca>
pkgname=ttf-merriweather
-_commit='a792c77e48a672b821c0a4f98900ed39b6b0b3e9'
-pkgver=2.003
+_commit='ae0bf55e53517ac98cc74c375a383ad4c36f937a'
+pkgver=2.005
pkgrel=1
epoch=1
pkgdesc='A typeface that is pleasant to read on screens by Sorkin Type Co'
@@ -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/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'
+source=("Merriweather-Black-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-Black.ttf"
+ "Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-BlackItalic.ttf"
+ "Merriweather-Bold-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-Bold.ttf"
+ "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-BoldItalic.ttf"
+ "Merriweather-Italic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-Italic.ttf"
+ "Merriweather-Light-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-Light.ttf"
+ "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-LightItalic.ttf"
+ "Merriweather-Regular-${pkgver}.ttf::https://github.com/SorkinType/Merriweather/raw/${_commit}/fonts/ttfs/Merriweather-Regular.ttf"
+ "${pkgname}-${pkgver}-OFL.txt::https://github.com/SorkinType/Merriweather/raw/${_commit}/OFL.txt")
+sha256sums=('73e4deb0e7c241a7e98ddcb9216c322be2a7f50df9b542f4aa3233154c12a852'
+ '1f83c77a970d9832143f481b32ea705f97f238a0e7bb2c6ecd30a1de1b902f54'
+ 'a03a68750a3ef5c50833ba8313e7ee4a1907c811da1a6e96a2f64718850706f4'
+ '96c3e940049b0f7fb500620998d5aa0ad0a901c6a67c359859dd90b88d20e373'
+ 'e9e7c00e9606290a2fc4e478f76256fe5e7b39f4e5c79bb3264595ffb18402bc'
+ '5acd66e1d1841fc30649e195480a9552fa7e55d62c73b8b4795513761f911fb6'
+ 'ba900a4ad03e5ee0fe0d91c083a0711bb1f434074950535a24583ad9e0bbf83d'
+ '22ce375fea4f4c394dafb0637b7c18fc1783c64524da6806159c771efbe9a47a'
'a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad')
package() {